Merge tag 'mac80211-next-for-davem-2018-01-04' of... (72deacce) · Commits · 戴 / test

drivers/net/wireless/mac80211_hwsim.c

+11 −6

Original line number	Original line	Diff line number	Diff line
	@@ -728,16 +728,21 @@ static int hwsim_fops_ps_write(void *dat, u64 val)
	val != PS_MANUAL_POLL)		val != PS_MANUAL_POLL)
	return -EINVAL;		return -EINVAL;

	old_ps = data->ps;
	data->ps = val;

	local_bh_disable();
	if (val == PS_MANUAL_POLL) {		if (val == PS_MANUAL_POLL) {
			if (data->ps != PS_ENABLED)
			return -EINVAL;
			local_bh_disable();
	ieee80211_iterate_active_interfaces_atomic(		ieee80211_iterate_active_interfaces_atomic(
	data->hw, IEEE80211_IFACE_ITER_NORMAL,		data->hw, IEEE80211_IFACE_ITER_NORMAL,
	hwsim_send_ps_poll, data);		hwsim_send_ps_poll, data);
	data->ps_poll_pending = true;		local_bh_enable();
	} else if (old_ps == PS_DISABLED && val != PS_DISABLED) {		return 0;
			}
			old_ps = data->ps;
			data->ps = val;

			local_bh_disable();
			if (old_ps == PS_DISABLED && val != PS_DISABLED) {
	ieee80211_iterate_active_interfaces_atomic(		ieee80211_iterate_active_interfaces_atomic(
	data->hw, IEEE80211_IFACE_ITER_NORMAL,		data->hw, IEEE80211_IFACE_ITER_NORMAL,
	hwsim_send_nullfunc_ps, data);		hwsim_send_nullfunc_ps, data);

include/net/cfg80211.h

+15 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1773,6 +1773,8 @@ enum cfg80211_signal_type {
	* by %parent_bssid.		* by %parent_bssid.
	* @parent_bssid: the BSS according to which %parent_tsf is set. This is set to		* @parent_bssid: the BSS according to which %parent_tsf is set. This is set to
	* the BSS that requested the scan in which the beacon/probe was received.		* the BSS that requested the scan in which the beacon/probe was received.
			* @chains: bitmask for filled values in @chain_signal.
			* @chain_signal: per-chain signal strength of last received BSS in dBm.
	*/		*/
	struct cfg80211_inform_bss {		struct cfg80211_inform_bss {
	struct ieee80211_channel *chan;		struct ieee80211_channel *chan;
	@@ -1781,6 +1783,8 @@ struct cfg80211_inform_bss {
	u64 boottime_ns;		u64 boottime_ns;
	u64 parent_tsf;		u64 parent_tsf;
	u8 parent_bssid[ETH_ALEN] __aligned(2);		u8 parent_bssid[ETH_ALEN] __aligned(2);
			u8 chains;
			s8 chain_signal[IEEE80211_MAX_CHAINS];
	};		};

	/**		/**
	@@ -1824,6 +1828,8 @@ struct cfg80211_bss_ies {
	* that holds the beacon data. @beacon_ies is still valid, of course, and		* that holds the beacon data. @beacon_ies is still valid, of course, and
	* points to the same data as hidden_beacon_bss->beacon_ies in that case.		* points to the same data as hidden_beacon_bss->beacon_ies in that case.
	* @signal: signal strength value (type depends on the wiphy's signal_type)		* @signal: signal strength value (type depends on the wiphy's signal_type)
			* @chains: bitmask for filled values in @chain_signal.
			* @chain_signal: per-chain signal strength of last received BSS in dBm.
	* @priv: private area for driver use, has at least wiphy->bss_priv_size bytes		* @priv: private area for driver use, has at least wiphy->bss_priv_size bytes
	*/		*/
	struct cfg80211_bss {		struct cfg80211_bss {
	@@ -1842,6 +1848,8 @@ struct cfg80211_bss {
	u16 capability;		u16 capability;

	u8 bssid[ETH_ALEN];		u8 bssid[ETH_ALEN];
			u8 chains;
			s8 chain_signal[IEEE80211_MAX_CHAINS];

	u8 priv[0] __aligned(sizeof(void *));		u8 priv[0] __aligned(sizeof(void *));
	};		};
	@@ -2021,6 +2029,9 @@ struct cfg80211_disassoc_request {
	* @ht_capa: HT Capabilities over-rides. Values set in ht_capa_mask		* @ht_capa: HT Capabilities over-rides. Values set in ht_capa_mask
	* will be used in ht_capa. Un-supported values will be ignored.		* will be used in ht_capa. Un-supported values will be ignored.
	* @ht_capa_mask: The bits of ht_capa which are to be used.		* @ht_capa_mask: The bits of ht_capa which are to be used.
			* @wep_keys: static WEP keys, if not NULL points to an array of
			* CFG80211_MAX_WEP_KEYS WEP keys
			* @wep_tx_key: key index (0..3) of the default TX static WEP key
	*/		*/
	struct cfg80211_ibss_params {		struct cfg80211_ibss_params {
	const u8 *ssid;		const u8 *ssid;
	@@ -2037,6 +2048,8 @@ struct cfg80211_ibss_params {
	int mcast_rate[NUM_NL80211_BANDS];		int mcast_rate[NUM_NL80211_BANDS];
	struct ieee80211_ht_cap ht_capa;		struct ieee80211_ht_cap ht_capa;
	struct ieee80211_ht_cap ht_capa_mask;		struct ieee80211_ht_cap ht_capa_mask;
			struct key_params *wep_keys;
			int wep_tx_key;
	};		};

	/**		/**
	@@ -5575,7 +5588,7 @@ void cfg80211_conn_failed(struct net_device dev, const u8 mac_addr,
	* cfg80211_rx_mgmt - notification of received, unprocessed management frame		* cfg80211_rx_mgmt - notification of received, unprocessed management frame
	* @wdev: wireless device receiving the frame		* @wdev: wireless device receiving the frame
	* @freq: Frequency on which the frame was received in MHz		* @freq: Frequency on which the frame was received in MHz
	* @sig_dbm: signal strength in mBm, or 0 if unknown		* @sig_dbm: signal strength in dBm, or 0 if unknown
	* @buf: Management frame (header + body)		* @buf: Management frame (header + body)
	* @len: length of the frame data		* @len: length of the frame data
	* @flags: flags, as defined in enum nl80211_rxmgmt_flags		* @flags: flags, as defined in enum nl80211_rxmgmt_flags
	@@ -5754,7 +5767,7 @@ void cfg80211_probe_status(struct net_device dev, const u8 addr,
	* @frame: the frame		* @frame: the frame
	* @len: length of the frame		* @len: length of the frame
	* @freq: frequency the frame was received on		* @freq: frequency the frame was received on
	* @sig_dbm: signal strength in mBm, or 0 if unknown		* @sig_dbm: signal strength in dBm, or 0 if unknown
	*		*
	* Use this function to report to userspace when a beacon was		* Use this function to report to userspace when a beacon was
	* received. It is not useful to call this when there is no		* received. It is not useful to call this when there is no

include/net/mac80211.h

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1552,6 +1552,9 @@ struct wireless_dev ieee80211_vif_to_wdev(struct ieee80211_vif vif);
	* @IEEE80211_KEY_FLAG_RESERVE_TAILROOM: This flag should be set by the		* @IEEE80211_KEY_FLAG_RESERVE_TAILROOM: This flag should be set by the
	* driver for a key to indicate that sufficient tailroom must always		* driver for a key to indicate that sufficient tailroom must always
	* be reserved for ICV or MIC, even when HW encryption is enabled.		* be reserved for ICV or MIC, even when HW encryption is enabled.
			* @IEEE80211_KEY_FLAG_PUT_MIC_SPACE: This flag should be set by the driver for
			* a TKIP key if it only requires MIC space. Do not set together with
			* @IEEE80211_KEY_FLAG_GENERATE_MMIC on the same key.
	*/		*/
	enum ieee80211_key_flags {		enum ieee80211_key_flags {
	IEEE80211_KEY_FLAG_GENERATE_IV_MGMT = BIT(0),		IEEE80211_KEY_FLAG_GENERATE_IV_MGMT = BIT(0),
	@@ -1562,6 +1565,7 @@ enum ieee80211_key_flags {
	IEEE80211_KEY_FLAG_PUT_IV_SPACE = BIT(5),		IEEE80211_KEY_FLAG_PUT_IV_SPACE = BIT(5),
	IEEE80211_KEY_FLAG_RX_MGMT = BIT(6),		IEEE80211_KEY_FLAG_RX_MGMT = BIT(6),
	IEEE80211_KEY_FLAG_RESERVE_TAILROOM = BIT(7),		IEEE80211_KEY_FLAG_RESERVE_TAILROOM = BIT(7),
			IEEE80211_KEY_FLAG_PUT_MIC_SPACE = BIT(8),
	};		};

	/**		/**
	@@ -1593,8 +1597,8 @@ struct ieee80211_key_conf {
	u8 icv_len;		u8 icv_len;
	u8 iv_len;		u8 iv_len;
	u8 hw_key_idx;		u8 hw_key_idx;
	u8 flags;
	s8 keyidx;		s8 keyidx;
			u16 flags;
	u8 keylen;		u8 keylen;
	u8 key[0];		u8 key[0];
	};		};
	@@ -2056,6 +2060,9 @@ struct ieee80211_txq {
	* The stack will not do fragmentation.		* The stack will not do fragmentation.
	* The callback for @set_frag_threshold should be set as well.		* The callback for @set_frag_threshold should be set as well.
	*		*
			* @IEEE80211_HW_SUPPORTS_TDLS_BUFFER_STA: Hardware supports buffer STA on
			* TDLS links.
			*
	* @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays		* @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
	*/		*/
	enum ieee80211_hw_flags {		enum ieee80211_hw_flags {
	@@ -2098,6 +2105,7 @@ enum ieee80211_hw_flags {
	IEEE80211_HW_TX_FRAG_LIST,		IEEE80211_HW_TX_FRAG_LIST,
	IEEE80211_HW_REPORTS_LOW_ACK,		IEEE80211_HW_REPORTS_LOW_ACK,
	IEEE80211_HW_SUPPORTS_TX_FRAG,		IEEE80211_HW_SUPPORTS_TX_FRAG,
			IEEE80211_HW_SUPPORTS_TDLS_BUFFER_STA,

	/* keep last, obviously */		/* keep last, obviously */
	NUM_IEEE80211_HW_FLAGS		NUM_IEEE80211_HW_FLAGS

include/uapi/linux/nl80211.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3862,6 +3862,9 @@ enum nl80211_bss_scan_width {
	* @NL80211_BSS_PARENT_BSSID. (u64).		* @NL80211_BSS_PARENT_BSSID. (u64).
	* @NL80211_BSS_PARENT_BSSID: the BSS according to which @NL80211_BSS_PARENT_TSF		* @NL80211_BSS_PARENT_BSSID: the BSS according to which @NL80211_BSS_PARENT_TSF
	* is set.		* is set.
			* @NL80211_BSS_CHAIN_SIGNAL: per-chain signal strength of last BSS update.
			* Contains a nested array of signal strength attributes (u8, dBm),
			* using the nesting index as the antenna number.
	* @__NL80211_BSS_AFTER_LAST: internal		* @__NL80211_BSS_AFTER_LAST: internal
	* @NL80211_BSS_MAX: highest BSS attribute		* @NL80211_BSS_MAX: highest BSS attribute
	*/		*/
	@@ -3885,6 +3888,7 @@ enum nl80211_bss {
	NL80211_BSS_PAD,		NL80211_BSS_PAD,
	NL80211_BSS_PARENT_TSF,		NL80211_BSS_PARENT_TSF,
	NL80211_BSS_PARENT_BSSID,		NL80211_BSS_PARENT_BSSID,
			NL80211_BSS_CHAIN_SIGNAL,

	/* keep last */		/* keep last */
	__NL80211_BSS_AFTER_LAST,		__NL80211_BSS_AFTER_LAST,

net/mac80211/agg-rx.c

+8 −18

Original line number	Original line	Diff line number	Diff line
	@@ -153,27 +153,16 @@ EXPORT_SYMBOL(ieee80211_stop_rx_ba_session);
	*/		*/
	static void sta_rx_agg_session_timer_expired(struct timer_list *t)		static void sta_rx_agg_session_timer_expired(struct timer_list *t)
	{		{
	struct tid_ampdu_rx *tid_rx_timer =		struct tid_ampdu_rx *tid_rx = from_timer(tid_rx, t, session_timer);
	from_timer(tid_rx_timer, t, session_timer);		struct sta_info *sta = tid_rx->sta;
	struct sta_info *sta = tid_rx_timer->sta;		u8 tid = tid_rx->tid;
	u8 tid = tid_rx_timer->tid;
	struct tid_ampdu_rx *tid_rx;
	unsigned long timeout;		unsigned long timeout;

	rcu_read_lock();
	tid_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[tid]);
	if (!tid_rx) {
	rcu_read_unlock();
	return;
	}

	timeout = tid_rx->last_rx + TU_TO_JIFFIES(tid_rx->timeout);		timeout = tid_rx->last_rx + TU_TO_JIFFIES(tid_rx->timeout);
	if (time_is_after_jiffies(timeout)) {		if (time_is_after_jiffies(timeout)) {
	mod_timer(&tid_rx->session_timer, timeout);		mod_timer(&tid_rx->session_timer, timeout);
	rcu_read_unlock();
	return;		return;
	}		}
	rcu_read_unlock();

	ht_dbg(sta->sdata, "RX session timer expired on %pM tid %d\n",		ht_dbg(sta->sdata, "RX session timer expired on %pM tid %d\n",
	sta->sta.addr, tid);		sta->sta.addr, tid);
	@@ -415,10 +404,11 @@ end:
	timeout);		timeout);
	}		}

	void __ieee80211_start_rx_ba_session(struct sta_info *sta,		static void __ieee80211_start_rx_ba_session(struct sta_info *sta,
	u8 dialog_token, u16 timeout,		u8 dialog_token, u16 timeout,
	u16 start_seq_num, u16 ba_policy, u16 tid,		u16 start_seq_num, u16 ba_policy,
	u16 buf_size, bool tx, bool auto_seq)		u16 tid, u16 buf_size, bool tx,
			bool auto_seq)
	{		{
	mutex_lock(&sta->ampdu_mlme.mtx);		mutex_lock(&sta->ampdu_mlme.mtx);
	___ieee80211_start_rx_ba_session(sta, dialog_token, timeout,		___ieee80211_start_rx_ba_session(sta, dialog_token, timeout,

Admin message