aboutsummaryrefslogtreecommitdiff
path: root/net/netlink/af_netlink.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2023-06-12 11:32:45 +0100
committerDavid S. Miller <davem@davemloft.net>2023-06-12 11:32:45 +0100
commitf2f069da4c40dcf136db731c9fece17c3bbf7cdc (patch)
tree4d86ba36fb3a24593be237c151aad15439d1bea8 /net/netlink/af_netlink.c
parent238131684f7b1bc2e0788583f22ed67bf3f5ca37 (diff)
parent500e1340d1d2695de3f15fc0b3781f593a77acc2 (diff)
downloadlinux-f2f069da4c40dcf136db731c9fece17c3bbf7cdc.tar.gz
linux-f2f069da4c40dcf136db731c9fece17c3bbf7cdc.tar.bz2
linux-f2f069da4c40dcf136db731c9fece17c3bbf7cdc.zip
Merge branch 'ethtool-extack'
Jakub Kicinski says: ==================== net: support extack in dump and simplify ethtool uAPI Ethtool currently requires header nest to be always present even if it doesn't have to carry any attr for a given request. This inflicts unnecessary pain on the users. What makes it worse is that extack was not working in dump's ->start() callback. Address both of those issues. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink/af_netlink.c')
-rw-r--r--net/netlink/af_netlink.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 3a1e0fd5bf14..cbd9aa7ee24a 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2360,7 +2360,9 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
cb->strict_check = !!(nlk2->flags & NETLINK_F_STRICT_CHK);
if (control->start) {
+ cb->extack = control->extack;
ret = control->start(cb);
+ cb->extack = NULL;
if (ret)
goto error_put;
}