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

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

Merge tag 'mac80211-for-davem-2015-10-13' of... 

Merge tag 'mac80211-for-davem-2015-10-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Like last time, we have two small fixes:
 * fast-xmit was not doing powersave filter clearing correctly,
   disable fast-xmit while any such operations are still pending
 * a debugfs file was broken due to some infrastructure changes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0f8b8e28 4633dfc3

net/mac80211/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static ssize_t hwflags_read(struct file *file, char __user *user_buf, 


	for (i = 0; i < NUM_IEEE80211_HW_FLAGS; i++) {

		if (test_bit(i, local->hw.flags))

			pos += scnprintf(pos, end - pos, "%s",

			pos += scnprintf(pos, end - pos, "%s\n",

					 hw_flag_names[i]);

	}

net/mac80211/status.c

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local, 
	 * when it wakes up for the next time.

	 */

	set_sta_flag(sta, WLAN_STA_CLEAR_PS_FILT);

	ieee80211_clear_fast_xmit(sta);



	/*

	 * This code races in the following way:

net/mac80211/tx.c

+5 −2
Original line number Diff line number Diff line
@@ -1218,8 +1218,10 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata, 


	if (!tx->sta)

		info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;

	else if (test_and_clear_sta_flag(tx->sta, WLAN_STA_CLEAR_PS_FILT))

	else if (test_and_clear_sta_flag(tx->sta, WLAN_STA_CLEAR_PS_FILT)) {

		info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;

		ieee80211_check_fast_xmit(tx->sta);

	}



	info->flags |= IEEE80211_TX_CTL_FIRST_FRAGMENT;
@@ -2451,7 +2453,8 @@ void ieee80211_check_fast_xmit(struct sta_info *sta) 


	if (test_sta_flag(sta, WLAN_STA_PS_STA) ||

	    test_sta_flag(sta, WLAN_STA_PS_DRIVER) ||

	    test_sta_flag(sta, WLAN_STA_PS_DELIVER))

	    test_sta_flag(sta, WLAN_STA_PS_DELIVER) ||

	    test_sta_flag(sta, WLAN_STA_CLEAR_PS_FILT))

		goto out;



	if (sdata->noack_map)