mac80211: manage AP netdev carrier state

The AP netdev is really only active when beaconing, so
manage the carrier state accordingly. Also do that for
VLAN interfaces enslaved to a given AP interface.

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

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 42e1fb2e700f30ffaf73fa7d934a68446bfde353..667d939433992075f5f6a102c8e53a8164ef954c 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -644,6 +644,10 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
 
        ieee80211_bss_info_change_notify(sdata, changed);
 
+       netif_carrier_on(dev);
+       list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
+               netif_carrier_on(vlan->dev);
+
        return 0;
 }
 
@@ -669,7 +673,7 @@ static int ieee80211_change_beacon(struct wiphy *wiphy, struct net_device *dev,
 
 static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
 {
-       struct ieee80211_sub_if_data *sdata;
+       struct ieee80211_sub_if_data *sdata, *vlan;
        struct beacon_data *old;
 
        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
@@ -678,6 +682,10 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
        if (!old)
                return -ENOENT;
 
+       list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
+               netif_carrier_off(vlan->dev);
+       netif_carrier_off(dev);
+
        RCU_INIT_POINTER(sdata->u.ap.beacon, NULL);
 
        kfree_rcu(old, rcu_head);

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index efb433d3dc25215072afaf26d469b71779480349..56a38a3088d4ad4171432018a788b6d82fe2bc53 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -254,7 +254,11 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
 
        switch (sdata->vif.type) {
        case NL80211_IFTYPE_AP_VLAN:
-               /* no need to tell driver */
+               /* no need to tell driver, but set carrier */
+               if (rtnl_dereference(sdata->bss->beacon))
+                       netif_carrier_on(dev);
+               else
+                       netif_carrier_off(dev);
                break;
        case NL80211_IFTYPE_MONITOR:
                if (sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES) {
@@ -294,7 +298,8 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
                ieee80211_bss_info_change_notify(sdata, changed);
 
                if (sdata->vif.type == NL80211_IFTYPE_STATION ||
-                   sdata->vif.type == NL80211_IFTYPE_ADHOC)
+                   sdata->vif.type == NL80211_IFTYPE_ADHOC ||
+                   sdata->vif.type == NL80211_IFTYPE_AP)
                        netif_carrier_off(dev);
                else
                        netif_carrier_on(dev);