mac80211: add support for control port protocol in AP mode

This will allow us to support dynamic WEP with 802.1X
properly in mac80211 by not encrypting outgoing and
accepting unencrypted incoming frames.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 32 insertions, 2 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 65b72ae2b4e0..1f1056172ef1 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -594,6 +594,8 @@ static int ieee80211_add_beacon(struct wiphy *wiphy, struct net_device *dev,
 {
         struct ieee80211_sub_if_data *sdata;
         struct beacon_data *old;
+        struct ieee80211_sub_if_data *vlan;
+        int ret;
 
         sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
@@ -601,7 +603,24 @@ static int ieee80211_add_beacon(struct wiphy *wiphy, struct net_device *dev,
         if (old)
                 return -EALREADY;
 
-        return ieee80211_config_beacon(sdata, params);
+        ret = ieee80211_config_beacon(sdata, params);
+        if (ret)
+                return ret;
+
+        /*
+         * Apply control port protocol, this allows us to
+         * not encrypt dynamic WEP control frames.
+         */
+        sdata->control_port_protocol = params->crypto.control_port_ethertype;
+        sdata->control_port_no_encrypt = params->crypto.control_port_no_encrypt;
+        list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) {
+                vlan->control_port_protocol =
+                        params->crypto.control_port_ethertype;
+                vlan->control_port_no_encrypt =
+                        params->crypto.control_port_no_encrypt;
+        }
+
+        return 0;
 }
 
 static int ieee80211_set_beacon(struct wiphy *wiphy, struct net_device *dev,
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 4ee624c543cb..b7bc4b7b80af 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -188,11 +188,22 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
                 if (!is_valid_ether_addr(sdata->u.wds.remote_addr))
                         return -ENOLINK;
                 break;
-        case NL80211_IFTYPE_AP_VLAN:
+        case NL80211_IFTYPE_AP_VLAN: {
+                struct ieee80211_sub_if_data *master;
+
                 if (!sdata->bss)
                         return -ENOLINK;
+
                 list_add(&sdata->u.vlan.list, &sdata->bss->vlans);
+
+                master = container_of(sdata->bss,
+                                      struct ieee80211_sub_if_data, u.ap);
+                sdata->control_port_protocol =
+                        master->control_port_protocol;
+                sdata->control_port_no_encrypt =
+                        master->control_port_no_encrypt;
                 break;
+                }
         case NL80211_IFTYPE_AP:
                 sdata->bss = &sdata->u.ap;
                 break;