Commit ab3a830d authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: move tdls_chan_switch_prohibited to link data 



This value should be per link, since a TDLS connection is
only established on a given link.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 635495e9

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -1759,7 +1759,7 @@ static int sta_apply_parameters(struct ieee80211_local *local, 


	/* mark TDLS channel switch support, if the AP allows it */

	if (test_sta_flag(sta, WLAN_STA_TDLS_PEER) &&

	    !sdata->u.mgd.tdls_chan_switch_prohibited &&

	    !sdata->deflink.u.mgd.tdls_chan_switch_prohibited &&

	    params->ext_capab_len >= 4 &&

	    params->ext_capab[3] & WLAN_EXT_CAPA4_TDLS_CHAN_SWITCH)

		set_sta_flag(sta, WLAN_STA_TDLS_CHAN_SWITCH);

net/mac80211/ieee80211_i.h

+2 −1
Original line number Diff line number Diff line
@@ -514,7 +514,6 @@ struct ieee80211_if_managed { 
	struct sk_buff *orig_teardown_skb; /* The original teardown skb */

	struct sk_buff *teardown_skb; /* A copy to send through the AP */

	spinlock_t teardown_lock; /* To lock changing teardown_skb */

	bool tdls_chan_switch_prohibited;

	bool tdls_wider_bw_prohibited;



	/* WMM-AC TSPEC support */
@@ -880,6 +879,8 @@ struct ieee80211_link_data_managed { 


	s16 p2p_noa_index;



	bool tdls_chan_switch_prohibited;



	bool have_beacon;

	bool tracking_signal_avg;

	bool disable_wmm_tracking;

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -3504,7 +3504,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, 
	}



	sdata->vif.cfg.aid = aid;

	ifmgd->tdls_chan_switch_prohibited =

	sdata->deflink.u.mgd.tdls_chan_switch_prohibited =

		elems->ext_capab && elems->ext_capab_len >= 5 &&

		(elems->ext_capab[4] & WLAN_EXT_CAPA5_TDLS_CH_SW_PROHIBITED);