aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-08-27 07:26:54 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-27 13:27:07 -0400
commita621fa4d6a7fdf9d34938d2e129a72624833eeeb (patch)
tree1b15e9fabbec3b2bdf04f5cd60526c0154a0dcc1 /net/mac80211/main.c
parentc0692b8fe29fb4d4dad33487aabf3ed7e1e880c0 (diff)
mac80211: allow changing port control protocol
Some vendor specified mechanisms for 802.1X-style functionality use a different protocol than EAP (even if EAP is vendor-extensible). Support this in mac80211 via the cfg80211 API for it. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 15f0e960fde8..964c267163a0 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -627,6 +627,9 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
627 local->hw.wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MESH_POINT); 627 local->hw.wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MESH_POINT);
628#endif 628#endif
629 629
630 /* mac80211 supports control port protocol changing */
631 local->hw.wiphy->flags |= WIPHY_FLAG_CONTROL_PORT_PROTOCOL;
632
630 if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM) 633 if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
631 local->hw.wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM; 634 local->hw.wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
632 else if (local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC) 635 else if (local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)