at master 1.0 kB view raw
1diff --git a/src/fuxi-gmac-net.c b/src/fuxi-gmac-net.c 2index d5baa9c..1667cc9 100755 3--- a/src/fuxi-gmac-net.c 4+++ b/src/fuxi-gmac-net.c 5@@ -870,9 +870,9 @@ static void fxgmac_stop_timers(struct fxgmac_pdata *pdata) 6 if (!channel->tx_ring) 7 break; 8 9- del_timer_sync(&channel->tx_timer); 10+ timer_delete_sync(&channel->tx_timer); 11 #if FXGMAC_TX_HANG_TIMER_ENABLED 12- del_timer_sync(&channel->tx_hang_timer); 13+ timer_delete_sync(&channel->tx_hang_timer); 14 channel->tx_hang_timer_active = 0; 15 #endif 16 } 17diff --git a/src/fuxi-gmac-phy.c b/src/fuxi-gmac-phy.c 18index b2e9455..8123d41 100755 19--- a/src/fuxi-gmac-phy.c 20+++ b/src/fuxi-gmac-phy.c 21@@ -368,6 +368,6 @@ int fxgmac_phy_timer_init(struct fxgmac_pdata *pdata) 22 23 void fxgmac_phy_timer_destroy(struct fxgmac_pdata *pdata) 24 { 25- del_timer_sync(&pdata->expansion.phy_poll_tm); 26+ timer_delete_sync(&pdata->expansion.phy_poll_tm); 27 DPRINTK("fxgmac_phy_timer removed\n"); 28 }