summaryrefslogtreecommitdiffstats
path: root/net/mac80211/chan.c
diff options
context:
space:
mode:
authorAyala Beker <ayala.beker@intel.com>2016-09-20 10:31:13 -0400
committerJohannes Berg <johannes.berg@intel.com>2016-09-30 07:21:14 -0400
commitcb3b7d87652aeb37cfb5295a6157a3280dae10cb (patch)
treea11a630c9a8aaa59cc1d08d76dca0e4db24b8e3b /net/mac80211/chan.c
parentb8676221f00dd5b6018f0fd88cd278f93e11143a (diff)
cfg80211: add start / stop NAN commands
This allows user space to start/stop NAN interface. A NAN interface is like P2P device in a few aspects: it doesn't have a netdev associated to it. Add the new interface type and prevent operations that can't be executed on NAN interface like scan. Define several attributes that may be configured by user space when starting NAN functionality (master preference and dual band operation) Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/chan.c')
-rw-r--r--net/mac80211/chan.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 74142d07ad31..d035801569eb 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -274,6 +274,7 @@ ieee80211_get_chanctx_max_required_bw(struct ieee80211_local *local,
274 ieee80211_get_max_required_bw(sdata)); 274 ieee80211_get_max_required_bw(sdata));
275 break; 275 break;
276 case NL80211_IFTYPE_P2P_DEVICE: 276 case NL80211_IFTYPE_P2P_DEVICE:
277 case NL80211_IFTYPE_NAN:
277 continue; 278 continue;
278 case NL80211_IFTYPE_ADHOC: 279 case NL80211_IFTYPE_ADHOC:
279 case NL80211_IFTYPE_WDS: 280 case NL80211_IFTYPE_WDS:
@@ -718,6 +719,7 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local,
718 719
719 switch (sdata->vif.type) { 720 switch (sdata->vif.type) {
720 case NL80211_IFTYPE_P2P_DEVICE: 721 case NL80211_IFTYPE_P2P_DEVICE:
722 case NL80211_IFTYPE_NAN:
721 continue; 723 continue;
722 case NL80211_IFTYPE_STATION: 724 case NL80211_IFTYPE_STATION:
723 if (!sdata->u.mgd.associated) 725 if (!sdata->u.mgd.associated)
@@ -980,6 +982,7 @@ ieee80211_vif_chanctx_reservation_complete(struct ieee80211_sub_if_data *sdata)
980 case NL80211_IFTYPE_P2P_CLIENT: 982 case NL80211_IFTYPE_P2P_CLIENT:
981 case NL80211_IFTYPE_P2P_GO: 983 case NL80211_IFTYPE_P2P_GO:
982 case NL80211_IFTYPE_P2P_DEVICE: 984 case NL80211_IFTYPE_P2P_DEVICE:
985 case NL80211_IFTYPE_NAN:
983 case NUM_NL80211_IFTYPES: 986 case NUM_NL80211_IFTYPES:
984 WARN_ON(1); 987 WARN_ON(1);
985 break; 988 break;