diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-10-24 22:44:11 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-10-24 22:44:11 +0200 |
| commit | 96917bb3a377e1ed103fd5c420a95e5fb25ca104 (patch) | |
| tree | 59e0ef14e8707efba95d2f795742ba69a03bc8d0 /net/ethtool | |
| parent | Merge branch 'ptp-ocxp-Oroli-ART-CARD' (diff) | |
| parent | Merge tag 'net-6.1-rc3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ne... (diff) | |
| download | linux-96917bb3a377e1ed103fd5c420a95e5fb25ca104.tar.xz linux-96917bb3a377e1ed103fd5c420a95e5fb25ca104.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/linux/net.h
a5ef058dc4d9 ("net: introduce and use custom sockopt socket flag")
e993ffe3da4b ("net: flag sockets supporting msghdr originated zerocopy")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ethtool')
| -rw-r--r-- | net/ethtool/pse-pd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c index 5a471e115b66..e8683e485dc9 100644 --- a/net/ethtool/pse-pd.c +++ b/net/ethtool/pse-pd.c @@ -64,7 +64,7 @@ static int pse_prepare_data(const struct ethnl_req_info *req_base, if (ret < 0) return ret; - ret = pse_get_pse_attributes(dev, info->extack, data); + ret = pse_get_pse_attributes(dev, info ? info->extack : NULL, data); ethnl_ops_complete(dev); |