Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3edaf3e6 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fe40cb62

net/mac80211/cfg.c

+9 −1
Original line number Diff line number Diff line
@@ -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);

net/mac80211/iface.c

+7 −2
Original line number Diff line number Diff line
@@ -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);