Commit 1448eb56 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
pull request: wireless 2014-05-08

This one is all from Johannes:

"Here are a few small fixes for the current cycle: radiotap TX flags were
wrong (fix by Bob), Chun-Yeow fixes an SMPS issue with mesh interfaces,
Eliad fixes a locking bug and a cfg80211 state problem and finally
Henning sent me a fix for IBSS rate information."

Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a9de0500 6153871f

include/net/cfg80211.h

+12 −0
Original line number Diff line number Diff line
@@ -3668,6 +3668,18 @@ void cfg80211_sched_scan_results(struct wiphy *wiphy); 
 */

void cfg80211_sched_scan_stopped(struct wiphy *wiphy);



/**

 * cfg80211_sched_scan_stopped_rtnl - notify that the scheduled scan has stopped

 *

 * @wiphy: the wiphy on which the scheduled scan stopped

 *

 * The driver can call this function to inform cfg80211 that the

 * scheduled scan had to be stopped, for whatever reason.  The driver

 * is then called back via the sched_scan_stop operation when done.

 * This function should be called with rtnl locked.

 */

void cfg80211_sched_scan_stopped_rtnl(struct wiphy *wiphy);



/**

 * cfg80211_inform_bss_width_frame - inform cfg80211 of a received BSS frame

 *

net/mac80211/rx.c

+2 −1
Original line number Diff line number Diff line
@@ -1231,7 +1231,8 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) 
		if (ether_addr_equal(bssid, rx->sdata->u.ibss.bssid) &&

		    test_sta_flag(sta, WLAN_STA_AUTHORIZED)) {

			sta->last_rx = jiffies;

			if (ieee80211_is_data(hdr->frame_control)) {

			if (ieee80211_is_data(hdr->frame_control) &&

			    !is_multicast_ether_addr(hdr->addr1)) {

				sta->last_rx_rate_idx = status->rate_idx;

				sta->last_rx_rate_flag = status->flag;

				sta->last_rx_rate_vht_flag = status->vht_flag;

net/mac80211/sta_info.c

+2 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,8 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) 
	atomic_dec(&ps->num_sta_ps);



	/* This station just woke up and isn't aware of our SMPS state */

	if (!ieee80211_smps_is_restrictive(sta->known_smps_mode,

	if (!ieee80211_vif_is_mesh(&sdata->vif) &&

	    !ieee80211_smps_is_restrictive(sta->known_smps_mode,

					   sdata->smps_mode) &&

	    sta->known_smps_mode != sdata->bss->req_smps &&

	    sta_info_tx_streams(sta) != 1) {

net/mac80211/status.c

+2 −3
Original line number Diff line number Diff line
@@ -314,10 +314,9 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local, 
	    !is_multicast_ether_addr(hdr->addr1))

		txflags |= IEEE80211_RADIOTAP_F_TX_FAIL;



	if ((info->status.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) ||

	    (info->status.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT))

	if (info->status.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT)

		txflags |= IEEE80211_RADIOTAP_F_TX_CTS;

	else if (info->status.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS)

	if (info->status.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS)

		txflags |= IEEE80211_RADIOTAP_F_TX_RTS;



	put_unaligned_le16(txflags, pos);

net/mac80211/util.c

+1 −1
Original line number Diff line number Diff line
@@ -1780,7 +1780,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
	mutex_unlock(&local->mtx);



	if (sched_scan_stopped)

		cfg80211_sched_scan_stopped(local->hw.wiphy);

		cfg80211_sched_scan_stopped_rtnl(local->hw.wiphy);



	/*

	 * If this is for hw restart things are still running.

CRA Git | Maintained and supported by SUSTech CRA and CCSE