aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/iface.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/iface.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/iface.c')
-rw-r--r--net/mac80211/iface.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 9369710cc65b..810e6764d04f 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -855,6 +855,9 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
855 sdata->dev->netdev_ops = &ieee80211_dataif_ops; 855 sdata->dev->netdev_ops = &ieee80211_dataif_ops;
856 sdata->wdev.iftype = type; 856 sdata->wdev.iftype = type;
857 857
858 sdata->control_port_protocol = cpu_to_be16(ETH_P_PAE);
859 sdata->control_port_no_encrypt = false;
860
858 /* only monitor differs */ 861 /* only monitor differs */
859 sdata->dev->type = ARPHRD_ETHER; 862 sdata->dev->type = ARPHRD_ETHER;
860 863