Merge pull request #17 from hcartiaux/master

Import changes from linux 5.17 for compatibility (closes #16)
wget · Apr 1, 2022 · 54b8e29 · 54b8e29
2 parents d4f36d3 + 665b2bd
commit 54b8e29
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/r8152.c b/r8152.c
@@ -18481,17 +18481,31 @@ static int rtl8152_set_tunable(struct net_device *netdev,
 }
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) */
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
 static void rtl8152_get_ringparam(struct net_device *netdev,
 				  struct ethtool_ringparam *ring)
+#else
+static void rtl8152_get_ringparam(struct net_device *netdev,
+				  struct ethtool_ringparam *ring,
+				  struct kernel_ethtool_ringparam *kernel_ring,
+				  struct netlink_ext_ack *extack)
+#endif
 {
 	struct r8152 *tp = netdev_priv(netdev);
 
 	ring->rx_max_pending = RTL8152_RX_MAX_PENDING;
 	ring->rx_pending = tp->rx_pending;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
 static int rtl8152_set_ringparam(struct net_device *netdev,
 				 struct ethtool_ringparam *ring)
+#else
+static int rtl8152_set_ringparam(struct net_device *netdev,
+				 struct ethtool_ringparam *ring,
+				 struct kernel_ethtool_ringparam *kernel_ring,
+				 struct netlink_ext_ack *extack)
+#endif
 {
 	struct r8152 *tp = netdev_priv(netdev);