fix patch

.SRCINFO

@@ -1,16 +1,14 @@
 pkgbase = yt6801-dkms
 	pkgdesc = Kernel module for Motorcomm YT6801 ethernet controller (DKMS)
 	pkgver = 1.0.31
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.motor-comm.com/product/ethernet-control-chip
 	arch = x86_64
 	license = GPL-2.0-or-later
 	depends = dkms
 	source = yt6801-1.0.31.zip::https://www.motor-comm.com/Cn/Skippower/downloadFile.html?id=1817
-	source = fix.patch
-	source = drop-flags.patch
+	source = patch.diff
 	sha256sums = 9ea62182bd520483df5fd3ec320262cbdddcc763f3128ae37abd26905a97e14c
-	sha256sums = 3e850f2d35fd3da6d10035b5ea04e995a0d7962b1c02599b42f1f7a296822e78
-	sha256sums = 814c6a121b392f512ec4c8898dd9f6c50ae3ff9d946bc1d115135fa6f5c6a897
+	sha256sums = 6cdb77774c483b640c8f0499fd54a79e773cd3f96a426cd99eec385972d9d5bb
 
 pkgname = yt6801-dkms

PKGBUILD

@@ -3,25 +3,22 @@
 _pkgbase=yt6801
 pkgname=yt6801-dkms
 pkgver=1.0.31
-pkgrel=1
+pkgrel=2
 pkgdesc="Kernel module for Motorcomm YT6801 ethernet controller (DKMS)"
 arch=('x86_64')
 url="https://www.motor-comm.com/product/ethernet-control-chip"
 license=('GPL-2.0-or-later')
 depends=('dkms')
 source=(${_pkgbase}-${pkgver}.zip::'https://www.motor-comm.com/Cn/Skippower/downloadFile.html?id=1817'
-        'fix.patch'
-        'drop-flags.patch')
+        'patch.diff')
 sha256sums=('9ea62182bd520483df5fd3ec320262cbdddcc763f3128ae37abd26905a97e14c'
-            '3e850f2d35fd3da6d10035b5ea04e995a0d7962b1c02599b42f1f7a296822e78'
-            '814c6a121b392f512ec4c8898dd9f6c50ae3ff9d946bc1d115135fa6f5c6a897')
+            '6cdb77774c483b640c8f0499fd54a79e773cd3f96a426cd99eec385972d9d5bb')
 
 prepare() {
   cd ${srcdir}
   mkdir src
   tar -zxf ${_pkgbase}-${pkgver}.tar.gz -C src
-  patch -p1 < drop-flags.patch
-  patch -p1 < fix.patch
+  patch -p1 < patch.diff
 }
 
 package() {

drop-flags.patch

@@ -1,11 +0,0 @@
---- a/src/dkms.conf
-+++ b/src/dkms.conf
-@@ -1,8 +1,5 @@
- PACKAGE_NAME="yt6801"
- PACKAGE_VERSION="1.0.30"
--CLEAN="make clean"
--MAKE[0]="make"
- BUILT_MODULE_NAME[0]="yt6801"
- DEST_MODULE_LOCATION[0]="/kernel/drivers/net/ethernet/motorcomm"
- AUTOINSTALL="yes"
--REMAKE_INITRD="yes"

patch.diff

@@ -1,6 +1,21 @@
+diff --git a/src/dkms.conf b/src/dkms.conf
+index 78eaf8b..9d93675 100644
+--- a/src/dkms.conf
++++ b/src/dkms.conf
+@@ -1,8 +1,5 @@
+ PACKAGE_NAME="yt6801"
+ PACKAGE_VERSION="1.0.31"
+-CLEAN="make clean"
+-MAKE[0]="make"
+ BUILT_MODULE_NAME[0]="yt6801"
+ DEST_MODULE_LOCATION[0]="/kernel/drivers/net/ethernet/motorcomm"
+ AUTOINSTALL="yes"
+-REMAKE_INITRD="yes"
+diff --git a/src/fuxi-gmac-net.c b/src/fuxi-gmac-net.c
+index 3e643f9..fea4c97 100644
 --- a/src/fuxi-gmac-net.c
 +++ b/src/fuxi-gmac-net.c
-@@ -772,7 +772,9 @@
+@@ -771,7 +771,9 @@ static void fxgmac_tx_hang_timer_handler(struct timer_list *t)
  static void fxgmac_tx_hang_timer_handler(unsigned long data)
  #endif
  {
@@ -11,9 +26,11 @@
      struct fxgmac_channel *channel = from_timer(channel, t, expansion.tx_hang_timer);
  #else
      struct fxgmac_channel *channel = (struct fxgmac_channel *)data;
+diff --git a/src/fuxi-gmac-phy.c b/src/fuxi-gmac-phy.c
+index 36d4fb3..8bd9533 100644
 --- a/src/fuxi-gmac-phy.c
 +++ b/src/fuxi-gmac-phy.c
-@@ -322,7 +322,9 @@
+@@ -324,7 +324,9 @@ static void fxgmac_phy_link_poll(struct timer_list *t)
  static void fxgmac_phy_link_poll(unsigned long data)
  #endif
  {
@@ -24,8 +41,8 @@
      struct fxgmac_pdata *pdata = from_timer(pdata, t, expansion.phy_poll_tm);
  #else
      struct fxgmac_pdata *pdata = (struct fxgmac_pdata*)data;
-@@ -350,7 +352,9 @@
-
+@@ -352,7 +354,9 @@ static void fxgmac_phy_link_poll(unsigned long data)
+ 
  int fxgmac_phy_timer_init(struct fxgmac_pdata *pdata)
  {
 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0))
@@ -35,8 +52,8 @@
      init_timer_key(&pdata->expansion.phy_poll_tm, NULL, 0, "fuxi_phy_link_update_timer", NULL);
  #else
      init_timer_key(&pdata->expansion.phy_poll_tm, 0, "fuxi_phy_link_update_timer", NULL);
-@@ -368,6 +372,10 @@
-
+@@ -370,6 +374,10 @@ int fxgmac_phy_timer_init(struct fxgmac_pdata *pdata)
+ 
  void fxgmac_phy_timer_destroy(struct fxgmac_pdata *pdata)
  {
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,0))
@@ -46,8 +63,10 @@
 +#endif
      DPRINTK("fxgmac_phy_timer removed\n");
  }
+diff --git a/src/fuxi-gmac.h b/src/fuxi-gmac.h
+index 539b507..2435f0c 100644
 --- a/src/fuxi-gmac.h
-+++ b/src//fuxi-gmac.h
++++ b/src/fuxi-gmac.h
 @@ -50,6 +50,8 @@
  #define FXGMAC_NS_IFA_LOCAL_LINK     1
  #define FXGMAC_NS_IFA_GLOBAL_UNICAST 2