fixed compilation issues around coalesce kernel api

3 files changed, 34 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2cb9b775017d..c3c91cdbb218 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = e1000e-dkms
 	pkgdesc = Intel e1000e Ethernet adapter driver (latest version from Intel) (DKMS version)
 	pkgver = 3.8.7
-	pkgrel = 2
+	pkgrel = 3
 	url = http://sourceforge.net/projects/e1000/
 	install = e1000e-dkms.install
 	arch = any
@@ -12,7 +12,9 @@ pkgbase = e1000e-dkms
 	optdepends = linux-lts-headers: build the module against LTS Arch kernel [requires at least one set of kernel headers]
 	source = http://downloads.sourceforge.net/project/e1000/e1000e%20historic%20archive/3.8.7/e1000e-3.8.7.tar.gz
 	source = dkms.conf.in
+	source = e1000e-3.8.7_coalesce_interface.patch
 	sha256sums = 63bad49d2d37c975e5f5f88689c953eeb9be37b0ef035945c79820a95f480f11
 	sha256sums = ebf49307a6773034c551755238221b36b0bd88990f897bf80716ec8e0c95b029
+	sha256sums = 6b75851d452ea9e3ae7d074a70f8defff0c9dc95df33a06bc68b73fa02797d8d
 
 pkgname = e1000e-dkms
diff --git a/PKGBUILD b/PKGBUILD
index edc22c6960ad..20aeadda0b14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=e1000e-dkms
 _modname=e1000e
 pkgver=3.8.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Intel e1000e Ethernet adapter driver (latest version from Intel) (DKMS version)"
 license=('GPL')
 arch=('any')
@@ -17,12 +17,15 @@ optdepends=('linux-headers: build the module against Arch kernel [requires at le
 install=e1000e-dkms.install
 url='http://sourceforge.net/projects/e1000/'
 source=("http://downloads.sourceforge.net/project/e1000/${_modname}%20historic%20archive/${pkgver}/${_modname}-${pkgver}.tar.gz"
-        'dkms.conf.in')
+        'dkms.conf.in'
+        'e1000e-3.8.7_coalesce_interface.patch')
 sha256sums=('63bad49d2d37c975e5f5f88689c953eeb9be37b0ef035945c79820a95f480f11'
-            'ebf49307a6773034c551755238221b36b0bd88990f897bf80716ec8e0c95b029')
+            'ebf49307a6773034c551755238221b36b0bd88990f897bf80716ec8e0c95b029'
+            '6b75851d452ea9e3ae7d074a70f8defff0c9dc95df33a06bc68b73fa02797d8d')
 
 package() {
   cd ${srcdir}/${_modname}-${pkgver}
+  patch -Np1 < ${srcdir}/e1000e-3.8.7_coalesce_interface.patch
   install -dm755 "${pkgdir}/usr/src/${_modname}-${pkgver}/"
   for i in "${srcdir}/${_modname}-${pkgver}/src/"*; do
     install -D -m644 "${i}" "${pkgdir}/usr/src/${_modname}-${pkgver}/"
diff --git a/e1000e-3.8.7_coalesce_interface.patch b/e1000e-3.8.7_coalesce_interface.patch
new file mode 100644
index 000000000000..5c6479df8973
--- /dev/null
+++ b/e1000e-3.8.7_coalesce_interface.patch
@@ -0,0 +1,25 @@
+diff -rauN e1000e-3.8.7/src/ethtool.c e1000e-3.8.7_coalesce_interface_patch/src/ethtool.c
+--- e1000e-3.8.7/src/ethtool.c	2020-06-30 12:11:13.000000000 +0200
++++ e1000e-3.8.7_coalesce_interface_patch/src/ethtool.c	2023-09-07 16:46:35.000000000 +0200
+@@ -2421,7 +2421,9 @@
+ #endif /* HAVE_ETHTOOL_SET_PHYS_ID */
+ 
+ static int e1000_get_coalesce(struct net_device *netdev,
+-			      struct ethtool_coalesce *ec)
++			      struct ethtool_coalesce *ec,
++			      struct kernel_ethtool_coalesce *kec,
++			      struct netlink_ext_ack *kack)
+ {
+ 	struct e1000_adapter *adapter = netdev_priv(netdev);
+ 
+@@ -2434,7 +2436,9 @@
+ }
+ 
+ static int e1000_set_coalesce(struct net_device *netdev,
+-			      struct ethtool_coalesce *ec)
++			      struct ethtool_coalesce *ec,
++			      struct kernel_ethtool_coalesce *kec,
++			      struct netlink_ext_ack *kack)
+ {
+ 	struct e1000_adapter *adapter = netdev_priv(netdev);
+