Unverified Commit 21de768e authored by Bogdan Voicu's avatar Bogdan Voicu Committed by GitHub
Browse files

linuxPackages.yt6801: fix build on kernel 6.15 (#415915)

parent 2b7fc209
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = kernel.moduleBuildDependencies ++ [ kmod ];

  patches = lib.optionals (lib.versionAtLeast kernel.version "6.15") [
    ./kernel_6.15_fix.patch
  ];

  postPatch = ''
    substituteInPlace src/Makefile \
      --replace-fail "sudo ls -l" "ls -l" \
+28 −0
Original line number Diff line number Diff line
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");
 }