Commit 86a2ea41 authored by Eliad Peller's avatar Eliad Peller Committed by John W. Linville
Browse files

mac80211: set carrier_on for ibss vifs only while joined 



mac80211 should set carrier_on for ibss vifs
only while they are joined (similar to sta vifs)

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 94e2ad9e

net/mac80211/ibss.c

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	/* if merging, indicate to driver that we leave the old IBSS */

	if (sdata->vif.bss_conf.ibss_joined) {

		sdata->vif.bss_conf.ibss_joined = false;

		netif_carrier_off(sdata->dev);

		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_IBSS);

	}
@@ -207,6 +208,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	bss = cfg80211_inform_bss_frame(local->hw.wiphy, local->hw.conf.channel,

					mgmt, skb->len, 0, GFP_KERNEL);

	cfg80211_put_bss(bss);

	netif_carrier_on(sdata->dev);

	cfg80211_ibss_joined(sdata->dev, ifibss->bssid, GFP_KERNEL);

}
@@ -990,6 +992,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) 
	}



	sta_info_flush(sdata->local, sdata);

	netif_carrier_off(sdata->dev);



	/* remove beacon */

	kfree(sdata->u.ibss.ie);

net/mac80211/iface.c

+2 −1
Original line number Diff line number Diff line
@@ -293,7 +293,8 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up) 
		changed |= ieee80211_reset_erp_info(sdata);

		ieee80211_bss_info_change_notify(sdata, changed);



		if (sdata->vif.type == NL80211_IFTYPE_STATION)

		if (sdata->vif.type == NL80211_IFTYPE_STATION ||

		    sdata->vif.type == NL80211_IFTYPE_ADHOC)

			netif_carrier_off(dev);

		else

			netif_carrier_on(dev);