summaryrefslogtreecommitdiffstats
path: root/net/wireless/nl80211.c
diff options
context:
space:
mode:
authorAndrei Otcheretianski <andrei.otcheretianski@intel.com>2016-10-19 06:47:47 +0200
committerJohannes Berg <johannes.berg@intel.com>2016-10-19 12:16:02 +0200
commit0ea2a2ee8de0501b132cc4454a31bbadbdb5dbbe (patch)
tree546abdf87b9bfbf9bc42976dcdcaf7b078b47616 /net/wireless/nl80211.c
parentcfg80211: allow aborting in-progress connection atttempts (diff)
downloadlinux-0ea2a2ee8de0501b132cc4454a31bbadbdb5dbbe.tar.xz
linux-0ea2a2ee8de0501b132cc4454a31bbadbdb5dbbe.zip
cfg80211: allow vendor commands to be sent to nan interface
Allow vendor commands that require WIPHY_VENDOR_CMD_NEED_RUNNING flag to be sent to NAN interface. Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r--net/wireless/nl80211.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e48b9c3988d3..fcf5b4f3f555 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -11258,7 +11258,8 @@ static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info)
if (wdev->netdev &&
!netif_running(wdev->netdev))
return -ENETDOWN;
- if (!wdev->netdev && !wdev->p2p_started)
+ if (!wdev->netdev && !wdev->p2p_started &&
+ !wdev->nan_started)
return -ENETDOWN;
}