From c03953a30f7ec0ecc8c555967e7ae07b04e879bb2dee57097cd3493e05f7eb4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kube=C4=8Dek?= Date: Fri, 15 May 2020 20:14:47 +0000 Subject: [PATCH] - update upstream references in post-5.6 patches OBS-URL: https://build.opensuse.org/package/show/network:utilities/ethtool?expand=0&rev=95 --- ethtool.changes | 11 ++++++++++- ...-accept-long-legacy-flag-names-when-setting-.patch | 3 ++- netlink-show-netlink-error-even-without-extack.patch | 3 ++- ...use-genetlink-ops-information-to-decide-abou.patch | 3 ++- ...tor-interface-between-ioctl-and-netlink-code.patch | 3 ++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ethtool.changes b/ethtool.changes index a6cb683..1b2bd3c 100644 --- a/ethtool.changes +++ b/ethtool.changes @@ -1,5 +1,14 @@ ------------------------------------------------------------------- -Tue May 12 21:27:12 UTC 2020 - Michal Kubeček +Fri May 15 20:12:57 UTC 2020 - Michal Kubecek + +- update upstream references: + features-accept-long-legacy-flag-names-when-setting-.patch + netlink-show-netlink-error-even-without-extack.patch + netlink-use-genetlink-ops-information-to-decide-abou.patch + refactor-interface-between-ioctl-and-netlink-code.patch + +------------------------------------------------------------------- +Tue May 12 21:27:12 UTC 2020 - Michal Kubecek - add fixes and improvements originally intended for 5.6: netlink-show-netlink-error-even-without-extack.patch diff --git a/features-accept-long-legacy-flag-names-when-setting-.patch b/features-accept-long-legacy-flag-names-when-setting-.patch index 3220c2e..290de45 100644 --- a/features-accept-long-legacy-flag-names-when-setting-.patch +++ b/features-accept-long-legacy-flag-names-when-setting-.patch @@ -1,7 +1,8 @@ From: Michal Kubecek Date: Mon, 13 Apr 2020 11:46:42 +0200 Subject: features: accept long legacy flag names when setting features -Patch-mainline: Submitted - 2020-04-13 - http://lkml.kernel.org/r/20200413212120.7D775E0FAD@unicorn.suse.cz +Patch-mainline: v5.7 +Git-commit: 4b1fa2c2d250441f83b90f9410cd6ce7d879c2fe The legacy feature flags have long names (e.g. "generic-receive-offload") and short names (e.g. "gro"). While "ethtool -k" shows only long names, diff --git a/netlink-show-netlink-error-even-without-extack.patch b/netlink-show-netlink-error-even-without-extack.patch index c16b503..515ceac 100644 --- a/netlink-show-netlink-error-even-without-extack.patch +++ b/netlink-show-netlink-error-even-without-extack.patch @@ -1,7 +1,8 @@ From: Michal Kubecek Date: Tue, 10 Mar 2020 13:24:55 +0100 Subject: netlink: show netlink error even without extack -Patch-mainline: Submitted - 2020-03-30 - http://lkml.kernel.org/r/20200330073305.CC634E0FC6@unicorn.suse.cz +Patch-mainline: v5.7 +Git-commit: 684f3e6c31bd096ef50725267957e0423b7932c6 Even if the NLMSG_ERROR message has no extack (NLM_F_ACK_TLVS not set, i.e. no error/warning message and bad attribute offset), we still want to diff --git a/netlink-use-genetlink-ops-information-to-decide-abou.patch b/netlink-use-genetlink-ops-information-to-decide-abou.patch index c8a7f41..baa3ff9 100644 --- a/netlink-use-genetlink-ops-information-to-decide-abou.patch +++ b/netlink-use-genetlink-ops-information-to-decide-abou.patch @@ -1,7 +1,8 @@ From: Michal Kubecek Date: Mon, 13 Apr 2020 17:39:32 +0200 Subject: netlink: use genetlink ops information to decide about fallback -Patch-mainline: Submitted - 2020-04-29 - http://lkml.kernel.org/r/8a495e43783170906ce3bf0213bc1dd7eca0e5c8.1588112572.git.mkubecek@suse.cz +Patch-mainline: v5.7 +Git-commit: 6c19c0d559c80824383c5f0e2dc229878d9b19f5 Currently ethtool falls back to ioctl when netlink socket initialization fails or if netlink request fails with -EOPNOTSUPP (and we do not know that diff --git a/refactor-interface-between-ioctl-and-netlink-code.patch b/refactor-interface-between-ioctl-and-netlink-code.patch index d121b9c..010d32c 100644 --- a/refactor-interface-between-ioctl-and-netlink-code.patch +++ b/refactor-interface-between-ioctl-and-netlink-code.patch @@ -1,7 +1,8 @@ From: Michal Kubecek Date: Mon, 13 Apr 2020 13:04:42 +0200 Subject: refactor interface between ioctl and netlink code -Patch-mainline: Submitted - 2020-04-29 - http://lkml.kernel.org/r/cb6ec48745c0626a6ca14fdc0c22f11a6578d648.1588112572.git.mkubecek@suse.cz +Patch-mainline: v5.7 +Git-commit: ab88f37fa432eea925306b442ac283daf71d8791 Move netlink related code from main() to separate handlers in netlink code. Improve the logic of fallback to ioctl and improve error messages when