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

Merge remote-tracking branch 'mac80211/master' into HEAD 



I want to get the full off-channel bugfix since later code depends on
it, as well as the AP client state change so I can revert it correctly.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 0ba44351 c1df932c

include/net/mac80211.h

+4 −2
Original line number Diff line number Diff line
@@ -2003,8 +2003,10 @@ enum ieee80211_hw_flags { 
 *	it shouldn't be set.

 *

 * @max_tx_aggregation_subframes: maximum number of subframes in an

 *	aggregate an HT driver will transmit, used by the peer as a

 *	hint to size its reorder buffer.

 *	aggregate an HT driver will transmit. Though ADDBA will advertise

 *	a constant value of 64 as some older APs can crash if the window

 *	size is smaller (an example is LinkSys WRT120N with FW v1.0.07

 *	build 002 Jun 18 2012).

 *

 * @offchannel_tx_hw_queue: HW queue ID to use for offchannel TX

 *	(if %IEEE80211_HW_QUEUE_CONTROL is set)

net/mac80211/agg-tx.c

+2 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) 
	/* send AddBA request */

	ieee80211_send_addba_request(sdata, sta->sta.addr, tid,

				     tid_tx->dialog_token, start_seq_num,

				     local->hw.max_tx_aggregation_subframes,

				     IEEE80211_MAX_AMPDU_BUF,

				     tid_tx->timeout);

}
@@ -926,6 +926,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, 
	amsdu = capab & IEEE80211_ADDBA_PARAM_AMSDU_MASK;

	tid = (capab & IEEE80211_ADDBA_PARAM_TID_MASK) >> 2;

	buf_size = (capab & IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK) >> 6;

	buf_size = min(buf_size, local->hw.max_tx_aggregation_subframes);



	mutex_lock(&sta->ampdu_mlme.mtx);

net/mac80211/cfg.c

+6 −2
Original line number Diff line number Diff line
@@ -3454,8 +3454,12 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
			goto out_unlock;

		}

	} else {

		/* for cookie below */

		ack_skb = skb;

		/* Assign a dummy non-zero cookie, it's not sent to

		 * userspace in this case but we rely on its value

		 * internally in the need_offchan case to distinguish

		 * mgmt-tx from remain-on-channel.

		 */

		*cookie = 0xffffffff;

	}



	if (!need_offchan) {

net/mac80211/iface.c

+3 −2
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ bool __ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata) 
void ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata,

			      bool update_bss)

{

	if (__ieee80211_recalc_txpower(sdata) || update_bss)

	if (__ieee80211_recalc_txpower(sdata) ||

	    (update_bss && ieee80211_sdata_running(sdata)))

		ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_TXPOWER);

}
@@ -1861,6 +1862,7 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) 
		unregister_netdevice(sdata->dev);

	} else {

		cfg80211_unregister_wdev(&sdata->wdev);

		ieee80211_teardown_sdata(sdata);

		kfree(sdata);

	}

}
@@ -1870,7 +1872,6 @@ void ieee80211_sdata_stop(struct ieee80211_sub_if_data *sdata) 
	if (WARN_ON_ONCE(!test_bit(SDATA_STATE_RUNNING, &sdata->state)))

		return;

	ieee80211_do_stop(sdata, true);

	ieee80211_teardown_sdata(sdata);

}



void ieee80211_remove_interfaces(struct ieee80211_local *local)

net/mac80211/main.c

+1 −2
Original line number Diff line number Diff line
@@ -541,8 +541,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, 
			   NL80211_FEATURE_HT_IBSS |

			   NL80211_FEATURE_VIF_TXPOWER |

			   NL80211_FEATURE_MAC_ON_CREATE |

			   NL80211_FEATURE_USERSPACE_MPM |

			   NL80211_FEATURE_FULL_AP_CLIENT_STATE;

			   NL80211_FEATURE_USERSPACE_MPM;



	if (!ops->hw_scan)

		wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |

CRA Git | Maintained and supported by SUSTech CRA and CCSE