646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
29 lines
1020 B
Diff
29 lines
1020 B
Diff
diff --git a/src/fuxi-gmac-net.c b/src/fuxi-gmac-net.c
|
|
index d5baa9c..1667cc9 100755
|
|
--- a/src/fuxi-gmac-net.c
|
|
+++ b/src/fuxi-gmac-net.c
|
|
@@ -870,9 +870,9 @@ static void fxgmac_stop_timers(struct fxgmac_pdata *pdata)
|
|
if (!channel->tx_ring)
|
|
break;
|
|
|
|
- del_timer_sync(&channel->tx_timer);
|
|
+ timer_delete_sync(&channel->tx_timer);
|
|
#if FXGMAC_TX_HANG_TIMER_ENABLED
|
|
- del_timer_sync(&channel->tx_hang_timer);
|
|
+ timer_delete_sync(&channel->tx_hang_timer);
|
|
channel->tx_hang_timer_active = 0;
|
|
#endif
|
|
}
|
|
diff --git a/src/fuxi-gmac-phy.c b/src/fuxi-gmac-phy.c
|
|
index b2e9455..8123d41 100755
|
|
--- a/src/fuxi-gmac-phy.c
|
|
+++ b/src/fuxi-gmac-phy.c
|
|
@@ -368,6 +368,6 @@ int fxgmac_phy_timer_init(struct fxgmac_pdata *pdata)
|
|
|
|
void fxgmac_phy_timer_destroy(struct fxgmac_pdata *pdata)
|
|
{
|
|
- del_timer_sync(&pdata->expansion.phy_poll_tm);
|
|
+ timer_delete_sync(&pdata->expansion.phy_poll_tm);
|
|
DPRINTK("fxgmac_phy_timer removed\n");
|
|
}
|