diff --git a/backport-ethtool-extend-ringparam-setting-getting-API-with-rx.patch b/backport-ethtool-extend-ringparam-setting-getting-API-with-rx.patch new file mode 100644 index 0000000000000000000000000000000000000000..5b6c364c28df698043e4e5f87a6ed99dfca9d3d9 --- /dev/null +++ b/backport-ethtool-extend-ringparam-setting-getting-API-with-rx.patch @@ -0,0 +1,42 @@ +From 7462494408cd3de8b0bc1e79670bf213288501d0 Mon Sep 17 00:00:00 2001 +From: Hao Chen +Date: Thu, 18 Nov 2021 20:12:43 +0800 +Subject: ethtool: extend ringparam setting/getting API with rx_buf_len + +Add two new parameters kernel_ringparam and extack for +.get_ringparam and .set_ringparam to extend more ring params +through netlink. + +--- + src/iavf_ethtool.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + delete mode 100644 src/.iavf_ethtool_stats.h.swp + +diff --git a/src/iavf_ethtool.c b/src/iavf_ethtool.c +index 3f7d427..545685f 100644 +--- a/src/iavf_ethtool.c ++++ b/src/iavf_ethtool.c +@@ -634,7 +634,9 @@ static void iavf_get_drvinfo(struct net_device *netdev, + * but the number of rings is not reported. + **/ + static void iavf_get_ringparam(struct net_device *netdev, +- struct ethtool_ringparam *ring) ++ struct ethtool_ringparam *ring, ++ struct kernel_ethtool_ringparam *kernel_ring, ++ struct netlink_ext_ack *extack) + { + struct iavf_adapter *adapter = netdev_priv(netdev); + +@@ -653,7 +655,9 @@ static void iavf_get_ringparam(struct net_device *netdev, + * number of rings is not specified, so all rings get the same settings. + **/ + static int iavf_set_ringparam(struct net_device *netdev, +- struct ethtool_ringparam *ring) ++ struct ethtool_ringparam *ring, ++ struct kernel_ethtool_ringparam *kernel_ring, ++ struct netlink_ext_ack *extack) + { + struct iavf_adapter *adapter = netdev_priv(netdev); + u32 new_rx_count, new_tx_count; +-- +2.27.0 diff --git a/iavf.spec b/iavf.spec index e26d1e87252da8ceb2e0bf94a60d5e9e2c9ba64d..f7fa50b1ff68babe87b080a561da4255fc2b68d0 100644 --- a/iavf.spec +++ b/iavf.spec @@ -9,7 +9,7 @@ Name: iavf Summary: Intel(R) Ethernet Adaptive Virtual Function Driver Version: 4.0.1 -Release: 6 +Release: 7 Vendor: Intel Corporation License: GPL-2.0 URL: http://support.intel.com @@ -21,6 +21,7 @@ BuildRequires: kernel-devel hwdata uname-build-checks gcc Patch0: fix-build-error-with-Linux-5.10.patch Patch1: backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch +Patch2: backport-ethtool-extend-ringparam-setting-getting-API-with-rx.patch %description This package contains the Intel(R) Ethernet Adaptive Virtual Function Driver. @@ -385,6 +386,12 @@ else fi %changelog +* Wed Jun 22 2022 gaihuiying - 4.0.1-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix build error beacuse of kernel api changes + * Sat Apr 16 2022 gaihuiying - 4.0.1-6 - Type:bugfix - ID:NA