Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (66ba271a) · Commits · e / devices / android_kernel_xiaomi_markw

include/net/cfg80211.h

+38 −8

Original line number	Diff line number	Diff line
		@@ -188,6 +188,8 @@ struct ieee80211_channel {
		* when used with 802.11g (on the 2.4 GHz band); filled by the
		* core code when registering the wiphy.
		* @IEEE80211_RATE_ERP_G: This is an ERP rate in 802.11g mode.
		* @IEEE80211_RATE_SUPPORTS_5MHZ: Rate can be used in 5 MHz mode
		* @IEEE80211_RATE_SUPPORTS_10MHZ: Rate can be used in 10 MHz mode
		*/
		enum ieee80211_rate_flags {
		IEEE80211_RATE_SHORT_PREAMBLE = 1<<0,
		@@ -195,6 +197,8 @@ enum ieee80211_rate_flags {
		IEEE80211_RATE_MANDATORY_B = 1<<2,
		IEEE80211_RATE_MANDATORY_G = 1<<3,
		IEEE80211_RATE_ERP_G = 1<<4,
		IEEE80211_RATE_SUPPORTS_5MHZ = 1<<5,
		IEEE80211_RATE_SUPPORTS_10MHZ = 1<<6,
		};

		/**
		@@ -432,6 +436,30 @@ bool cfg80211_chandef_usable(struct wiphy *wiphy,
		const struct cfg80211_chan_def *chandef,
		u32 prohibited_flags);

		/**
		* ieee80211_chandef_rate_flags - returns rate flags for a channel
		*
		* In some channel types, not all rates may be used - for example CCK
		* rates may not be used in 5/10 MHz channels.
		*
		* @chandef: channel definition for the channel
		*
		* Returns: rate flags which apply for this channel
		*/
		static inline enum ieee80211_rate_flags
		ieee80211_chandef_rate_flags(struct cfg80211_chan_def *chandef)
		{
		switch (chandef->width) {
		case NL80211_CHAN_WIDTH_5:
		return IEEE80211_RATE_SUPPORTS_5MHZ;
		case NL80211_CHAN_WIDTH_10:
		return IEEE80211_RATE_SUPPORTS_10MHZ;
		default:
		break;
		}
		return 0;
		}

		/**
		* enum survey_info_flags - survey information flags
		*
		@@ -1431,7 +1459,8 @@ const u8 ieee80211_bss_get_ie(struct cfg80211_bss bss, u8 ie);
		* This structure provides information needed to complete IEEE 802.11
		* authentication.
		*
		* @bss: The BSS to authenticate with.
		* @bss: The BSS to authenticate with, the callee must obtain a reference
		* to it if it needs to keep it.
		* @auth_type: Authentication type (algorithm)
		* @ie: Extra IEs to add to Authentication frame or %NULL
		* @ie_len: Length of ie buffer in octets
		@@ -1469,11 +1498,10 @@ enum cfg80211_assoc_req_flags {
		*
		* This structure provides information needed to complete IEEE 802.11
		* (re)association.
		* @bss: The BSS to associate with. If the call is successful the driver
		* is given a reference that it must release, normally via a call to
		* cfg80211_send_rx_assoc(), or, if association timed out, with a
		* call to cfg80211_put_bss() (in addition to calling
		* cfg80211_send_assoc_timeout())
		* @bss: The BSS to associate with. If the call is successful the driver is
		* given a reference that it must give back to cfg80211_send_rx_assoc()
		* or to cfg80211_assoc_timeout(). To ensure proper refcounting, new
		* association requests while already associating must be rejected.
		* @ie: Extra IEs to add to (Re)Association Request frame or %NULL
		* @ie_len: Length of ie buffer in octets
		* @use_mfp: Use management frame protection (IEEE 802.11w) in this association
		@@ -2342,6 +2370,7 @@ struct cfg80211_ops {
		* responds to probe-requests in hardware.
		* @WIPHY_FLAG_OFFCHAN_TX: Device supports direct off-channel TX.
		* @WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL: Device supports remain-on-channel call.
		* @WIPHY_FLAG_SUPPORTS_5_10_MHZ: Device supports 5 MHz and 10 MHz channels.
		*/
		enum wiphy_flags {
		WIPHY_FLAG_CUSTOM_REGULATORY = BIT(0),
		@@ -2365,6 +2394,7 @@ enum wiphy_flags {
		WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD = BIT(19),
		WIPHY_FLAG_OFFCHAN_TX = BIT(20),
		WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL = BIT(21),
		WIPHY_FLAG_SUPPORTS_5_10_MHZ = BIT(22),
		};

		/**
		@@ -3492,11 +3522,11 @@ void cfg80211_rx_assoc_resp(struct net_device *dev,
		/**
		* cfg80211_assoc_timeout - notification of timed out association
		* @dev: network device
		* @addr: The MAC address of the device with which the association timed out
		* @bss: The BSS entry with which association timed out.
		*
		* This function may sleep. The caller must hold the corresponding wdev's mutex.
		*/
		void cfg80211_assoc_timeout(struct net_device dev, const u8 addr);
		void cfg80211_assoc_timeout(struct net_device dev, struct cfg80211_bss bss);

		/**
		* cfg80211_tx_mlme_mgmt - notification of transmitted deauth/disassoc frame

include/net/mac80211.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,7 @@ enum ieee80211_rssi_event {
		* @basic_rates: bitmap of basic rates, each bit stands for an
		* index into the rate table configured by the driver in
		* the current band.
		* @beacon_rate: associated AP's beacon TX rate
		* @mcast_rate: per-band multicast rate index + 1 (0: disabled)
		* @bssid: The BSSID for this BSS
		* @enable_beacon: whether beaconing should be enabled or not
		@@ -352,6 +353,7 @@ struct ieee80211_bss_conf {
		u32 sync_device_ts;
		u8 sync_dtim_count;
		u32 basic_rates;
		struct ieee80211_rate *beacon_rate;
		int mcast_rate[IEEE80211_NUM_BANDS];
		u16 ht_operation_mode;
		s32 cqm_rssi_thold;

include/uapi/linux/nl80211.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -2758,6 +2758,8 @@ enum nl80211_channel_type {
		* and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well
		* @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
		* attribute must be provided as well
		* @NL80211_CHAN_WIDTH_5: 5 MHz OFDM channel
		* @NL80211_CHAN_WIDTH_10: 10 MHz OFDM channel
		*/
		enum nl80211_chan_width {
		NL80211_CHAN_WIDTH_20_NOHT,
		@@ -2766,6 +2768,8 @@ enum nl80211_chan_width {
		NL80211_CHAN_WIDTH_80,
		NL80211_CHAN_WIDTH_80P80,
		NL80211_CHAN_WIDTH_160,
		NL80211_CHAN_WIDTH_5,
		NL80211_CHAN_WIDTH_10,
		};

		/**

net/mac80211/cfg.c

+2 −12

Original line number	Diff line number	Diff line
		@@ -2827,7 +2827,8 @@ static int ieee80211_mgmt_tx(struct wiphy wiphy, struct wireless_dev wdev,
		!rcu_access_pointer(sdata->bss->beacon))
		need_offchan = true;
		if (!ieee80211_is_action(mgmt->frame_control) \|\|
		mgmt->u.action.category == WLAN_CATEGORY_PUBLIC)
		mgmt->u.action.category == WLAN_CATEGORY_PUBLIC \|\|
		mgmt->u.action.category == WLAN_CATEGORY_SELF_PROTECTED)
		break;
		rcu_read_lock();
		sta = sta_info_get(sdata, mgmt->da);
		@@ -2930,19 +2931,8 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
		u16 frame_type, bool reg)
		{
		struct ieee80211_local *local = wiphy_priv(wiphy);
		struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);

		switch (frame_type) {
		case IEEE80211_FTYPE_MGMT \| IEEE80211_STYPE_AUTH:
		if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
		struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;

		if (reg)
		ifibss->auth_frame_registrations++;
		else
		ifibss->auth_frame_registrations--;
		}
		break;
		case IEEE80211_FTYPE_MGMT \| IEEE80211_STYPE_PROBE_REQ:
		if (reg)
		local->probe_req_reg++;

net/mac80211/ht.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -281,13 +281,14 @@ void ieee80211_ba_session_work(struct work_struct *work)
		sta, tid, WLAN_BACK_RECIPIENT,
		WLAN_REASON_UNSPECIFIED, true);

		spin_lock_bh(&sta->lock);

		tid_tx = sta->ampdu_mlme.tid_start_tx[tid];
		if (tid_tx) {
		/*
		* Assign it over to the normal tid_tx array
		* where it "goes live".
		*/
		spin_lock_bh(&sta->lock);

		sta->ampdu_mlme.tid_start_tx[tid] = NULL;
		/* could there be a race? */
		@@ -300,6 +301,7 @@ void ieee80211_ba_session_work(struct work_struct *work)
		ieee80211_tx_ba_session_handle_start(sta, tid);
		continue;
		}
		spin_unlock_bh(&sta->lock);

		tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
		if (tid_tx && test_and_clear_bit(HT_AGG_STATE_WANT_STOP,