diff options
| author | David S. Miller <davem@davemloft.net> | 2020-07-30 17:47:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-30 17:47:34 -0700 |
| commit | d0c3c75d5d8911b0e92e48ce79b827ad869d5c93 (patch) | |
| tree | 4c4eb2947cd7a46d929640cffa5b553b205c19e7 /net/wireless | |
| parent | 85496a29224188051b6135eb38da8afd4c584765 (diff) | |
| parent | 04e35caa32ec9aae6b306d07f07dc2ee6d69166c (diff) | |
Merge tag 'mac80211-for-davem-2020-07-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A couple of more changes:
* remove a warning that can trigger in certain races
* check a function pointer before using it
* check before adding 6 GHz to avoid a warning in mesh
* fix two memory leaks in mesh
* fix a TX status bug leading to a memory leak
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 0e07fb8585fb..7fbca0854265 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -13266,13 +13266,13 @@ static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info) if (!wdev_running(wdev)) return -ENETDOWN; } - - if (!vcmd->doit) - return -EOPNOTSUPP; } else { wdev = NULL; } + if (!vcmd->doit) + return -EOPNOTSUPP; + if (info->attrs[NL80211_ATTR_VENDOR_DATA]) { data = nla_data(info->attrs[NL80211_ATTR_VENDOR_DATA]); len = nla_len(info->attrs[NL80211_ATTR_VENDOR_DATA]); |