Merge tag 'mac80211-next-for-davem-2016-05-12' of... (7fd38193) · Commits · 戴 / test

Documentation/DocBook/80211.tmpl

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -135,6 +135,7 @@
	!Finclude/net/cfg80211.h cfg80211_tx_mlme_mgmt		!Finclude/net/cfg80211.h cfg80211_tx_mlme_mgmt
	!Finclude/net/cfg80211.h cfg80211_ibss_joined		!Finclude/net/cfg80211.h cfg80211_ibss_joined
	!Finclude/net/cfg80211.h cfg80211_connect_result		!Finclude/net/cfg80211.h cfg80211_connect_result
			!Finclude/net/cfg80211.h cfg80211_connect_bss
	!Finclude/net/cfg80211.h cfg80211_roamed		!Finclude/net/cfg80211.h cfg80211_roamed
	!Finclude/net/cfg80211.h cfg80211_disconnected		!Finclude/net/cfg80211.h cfg80211_disconnected
	!Finclude/net/cfg80211.h cfg80211_ready_on_channel		!Finclude/net/cfg80211.h cfg80211_ready_on_channel

include/net/cfg80211.h

+45 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1045,11 +1045,12 @@ struct cfg80211_tid_stats {
	* @rx_beacon: number of beacons received from this peer		* @rx_beacon: number of beacons received from this peer
	* @rx_beacon_signal_avg: signal strength average (in dBm) for beacons received		* @rx_beacon_signal_avg: signal strength average (in dBm) for beacons received
	* from this peer		* from this peer
			* @rx_duration: aggregate PPDU duration(usecs) for all the frames from a peer
	* @pertid: per-TID statistics, see &struct cfg80211_tid_stats, using the last		* @pertid: per-TID statistics, see &struct cfg80211_tid_stats, using the last
	* (IEEE80211_NUM_TIDS) index for MSDUs not encapsulated in QoS-MPDUs.		* (IEEE80211_NUM_TIDS) index for MSDUs not encapsulated in QoS-MPDUs.
	*/		*/
	struct station_info {		struct station_info {
	u32 filled;		u64 filled;
	u32 connected_time;		u32 connected_time;
	u32 inactive_time;		u32 inactive_time;
	u64 rx_bytes;		u64 rx_bytes;
	@@ -1088,6 +1089,7 @@ struct station_info {
	u32 expected_throughput;		u32 expected_throughput;

	u64 rx_beacon;		u64 rx_beacon;
			u64 rx_duration;
	u8 rx_beacon_signal_avg;		u8 rx_beacon_signal_avg;
	struct cfg80211_tid_stats pertid[IEEE80211_NUM_TIDS + 1];		struct cfg80211_tid_stats pertid[IEEE80211_NUM_TIDS + 1];
	};		};
	@@ -3187,6 +3189,9 @@ struct wiphy_vendor_command {
	* @vht_capa_mod_mask: Specify what VHT capabilities can be over-ridden.		* @vht_capa_mod_mask: Specify what VHT capabilities can be over-ridden.
	* If null, then none can be over-ridden.		* If null, then none can be over-ridden.
	*		*
			* @wdev_list: the list of associated (virtual) interfaces; this list must
			* not be modified by the driver, but can be read with RTNL/RCU protection.
			*
	* @max_acl_mac_addrs: Maximum number of MAC addresses that the device		* @max_acl_mac_addrs: Maximum number of MAC addresses that the device
	* supports for ACL.		* supports for ACL.
	*		*
	@@ -3326,6 +3331,8 @@ struct wiphy {
	const struct ieee80211_ht_cap *ht_capa_mod_mask;		const struct ieee80211_ht_cap *ht_capa_mod_mask;
	const struct ieee80211_vht_cap *vht_capa_mod_mask;		const struct ieee80211_vht_cap *vht_capa_mod_mask;

			struct list_head wdev_list;

	/* the network namespace this phy lives in currently */		/* the network namespace this phy lives in currently */
	possible_net_t _net;		possible_net_t _net;

	@@ -3891,7 +3898,7 @@ const u8 cfg80211_find_ie(u8 eid, const u8 ies, int len);
	* cfg80211_find_vendor_ie - find vendor specific information element in data		* cfg80211_find_vendor_ie - find vendor specific information element in data
	*		*
	* @oui: vendor OUI		* @oui: vendor OUI
	* @oui_type: vendor-specific OUI type		* @oui_type: vendor-specific OUI type (must be < 0xff), negative means any
	* @ies: data consisting of IEs		* @ies: data consisting of IEs
	* @len: length of data		* @len: length of data
	*		*
	@@ -3903,7 +3910,7 @@ const u8 cfg80211_find_ie(u8 eid, const u8 ies, int len);
	* Note: There are no checks on the element length other than having to fit into		* Note: There are no checks on the element length other than having to fit into
	* the given data.		* the given data.
	*/		*/
	const u8 *cfg80211_find_vendor_ie(unsigned int oui, u8 oui_type,		const u8 *cfg80211_find_vendor_ie(unsigned int oui, int oui_type,
	const u8 *ies, int len);		const u8 *ies, int len);

	/**		/**
	@@ -4649,6 +4656,32 @@ static inline void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)
	#define CFG80211_TESTMODE_DUMP(cmd)		#define CFG80211_TESTMODE_DUMP(cmd)
	#endif		#endif

			/**
			* cfg80211_connect_bss - notify cfg80211 of connection result
			*
			* @dev: network device
			* @bssid: the BSSID of the AP
			* @bss: entry of bss to which STA got connected to, can be obtained
			* through cfg80211_get_bss (may be %NULL)
			* @req_ie: association request IEs (maybe be %NULL)
			* @req_ie_len: association request IEs length
			* @resp_ie: association response IEs (may be %NULL)
			* @resp_ie_len: assoc response IEs length
			* @status: status code, 0 for successful connection, use
			* %WLAN_STATUS_UNSPECIFIED_FAILURE if your device cannot give you
			* the real status code for failures.
			* @gfp: allocation flags
			*
			* It should be called by the underlying driver whenever connect() has
			* succeeded. This is similar to cfg80211_connect_result(), but with the
			* option of identifying the exact bss entry for the connection. Only one of
			* these functions should be called.
			*/
			void cfg80211_connect_bss(struct net_device dev, const u8 bssid,
			struct cfg80211_bss bss, const u8 req_ie,
			size_t req_ie_len, const u8 *resp_ie,
			size_t resp_ie_len, u16 status, gfp_t gfp);

	/**		/**
	* cfg80211_connect_result - notify cfg80211 of connection result		* cfg80211_connect_result - notify cfg80211 of connection result
	*		*
	@@ -4666,10 +4699,15 @@ static inline void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)
	* It should be called by the underlying driver whenever connect() has		* It should be called by the underlying driver whenever connect() has
	* succeeded.		* succeeded.
	*/		*/
	void cfg80211_connect_result(struct net_device dev, const u8 bssid,		static inline void
			cfg80211_connect_result(struct net_device dev, const u8 bssid,
	const u8 *req_ie, size_t req_ie_len,		const u8 *req_ie, size_t req_ie_len,
	const u8 *resp_ie, size_t resp_ie_len,		const u8 *resp_ie, size_t resp_ie_len,
	u16 status, gfp_t gfp);		u16 status, gfp_t gfp)
			{
			cfg80211_connect_bss(dev, bssid, NULL, req_ie, req_ie_len, resp_ie,
			resp_ie_len, status, gfp);
			}

	/**		/**
	* cfg80211_roamed - notify cfg80211 of roaming		* cfg80211_roamed - notify cfg80211 of roaming

include/net/mac80211.h

+32 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1068,6 +1068,9 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
	* @RX_FLAG_RADIOTAP_VENDOR_DATA: This frame contains vendor-specific		* @RX_FLAG_RADIOTAP_VENDOR_DATA: This frame contains vendor-specific
	* radiotap data in the skb->data (before the frame) as described by		* radiotap data in the skb->data (before the frame) as described by
	* the &struct ieee80211_vendor_radiotap.		* the &struct ieee80211_vendor_radiotap.
			* @RX_FLAG_ALLOW_SAME_PN: Allow the same PN as same packet before.
			* This is used for AMSDU subframes which can have the same PN as
			* the first subframe.
	*/		*/
	enum mac80211_rx_flags {		enum mac80211_rx_flags {
	RX_FLAG_MMIC_ERROR = BIT(0),		RX_FLAG_MMIC_ERROR = BIT(0),
	@@ -1102,6 +1105,7 @@ enum mac80211_rx_flags {
	RX_FLAG_AMSDU_MORE = BIT(30),		RX_FLAG_AMSDU_MORE = BIT(30),
	RX_FLAG_RADIOTAP_VENDOR_DATA = BIT(31),		RX_FLAG_RADIOTAP_VENDOR_DATA = BIT(31),
	RX_FLAG_MIC_STRIPPED = BIT_ULL(32),		RX_FLAG_MIC_STRIPPED = BIT_ULL(32),
			RX_FLAG_ALLOW_SAME_PN = BIT_ULL(33),
	};		};

	#define RX_FLAG_STBC_SHIFT 26		#define RX_FLAG_STBC_SHIFT 26
	@@ -3992,6 +3996,33 @@ static inline int ieee80211_sta_ps_transition_ni(struct ieee80211_sta *sta,
	return ret;		return ret;
	}		}

			/**
			* ieee80211_sta_pspoll - PS-Poll frame received
			* @sta: currently connected station
			*
			* When operating in AP mode with the %IEEE80211_HW_AP_LINK_PS flag set,
			* use this function to inform mac80211 that a PS-Poll frame from a
			* connected station was received.
			* This must be used in conjunction with ieee80211_sta_ps_transition()
			* and possibly ieee80211_sta_uapsd_trigger(); calls to all three must
			* be serialized.
			*/
			void ieee80211_sta_pspoll(struct ieee80211_sta *sta);

			/**
			* ieee80211_sta_uapsd_trigger - (potential) U-APSD trigger frame received
			* @sta: currently connected station
			* @tid: TID of the received (potential) trigger frame
			*
			* When operating in AP mode with the %IEEE80211_HW_AP_LINK_PS flag set,
			* use this function to inform mac80211 that a (potential) trigger frame
			* from a connected station was received.
			* This must be used in conjunction with ieee80211_sta_ps_transition()
			* and possibly ieee80211_sta_pspoll(); calls to all three must be
			* serialized.
			*/
			void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *sta, u8 tid);

	/*		/*
	* The TX headroom reserved by mac80211 for its own tx_status functions.		* The TX headroom reserved by mac80211 for its own tx_status functions.
	* This is enough for the radiotap header.		* This is enough for the radiotap header.

include/uapi/linux/nl80211.h

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1817,6 +1817,8 @@ enum nl80211_commands {
	* @NL80211_ATTR_STA_SUPPORT_P2P_PS: whether P2P PS mechanism supported		* @NL80211_ATTR_STA_SUPPORT_P2P_PS: whether P2P PS mechanism supported
	* or not. u8, one of the values of &enum nl80211_sta_p2p_ps_status		* or not. u8, one of the values of &enum nl80211_sta_p2p_ps_status
	*		*
			* @NL80211_ATTR_PAD: attribute used for padding for 64-bit alignment
			*
	* @NUM_NL80211_ATTR: total number of nl80211_attrs available		* @NUM_NL80211_ATTR: total number of nl80211_attrs available
	* @NL80211_ATTR_MAX: highest attribute number currently defined		* @NL80211_ATTR_MAX: highest attribute number currently defined
	* @__NL80211_ATTR_AFTER_LAST: internal use		* @__NL80211_ATTR_AFTER_LAST: internal use
	@@ -2513,6 +2515,9 @@ enum nl80211_sta_bss_param {
	* TID+1 and the special TID 16 (i.e. value 17) is used for non-QoS frames;		* TID+1 and the special TID 16 (i.e. value 17) is used for non-QoS frames;
	* each one of those is again nested with &enum nl80211_tid_stats		* each one of those is again nested with &enum nl80211_tid_stats
	* attributes carrying the actual values.		* attributes carrying the actual values.
			* @NL80211_STA_INFO_RX_DURATION: aggregate PPDU duration for all frames
			* received from the station (u64, usec)
			* @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment
	* @__NL80211_STA_INFO_AFTER_LAST: internal		* @__NL80211_STA_INFO_AFTER_LAST: internal
	* @NL80211_STA_INFO_MAX: highest possible station info attribute		* @NL80211_STA_INFO_MAX: highest possible station info attribute
	*/		*/
	@@ -2549,6 +2554,8 @@ enum nl80211_sta_info {
	NL80211_STA_INFO_BEACON_RX,		NL80211_STA_INFO_BEACON_RX,
	NL80211_STA_INFO_BEACON_SIGNAL_AVG,		NL80211_STA_INFO_BEACON_SIGNAL_AVG,
	NL80211_STA_INFO_TID_STATS,		NL80211_STA_INFO_TID_STATS,
			NL80211_STA_INFO_RX_DURATION,
			NL80211_STA_INFO_PAD,

	/* keep last */		/* keep last */
	__NL80211_STA_INFO_AFTER_LAST,		__NL80211_STA_INFO_AFTER_LAST,
	@@ -2565,6 +2572,7 @@ enum nl80211_sta_info {
	* transmitted MSDUs (not counting the first attempt; u64)		* transmitted MSDUs (not counting the first attempt; u64)
	* @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted		* @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted
	* MSDUs (u64)		* MSDUs (u64)
			* @NL80211_TID_STATS_PAD: attribute used for padding for 64-bit alignment
	* @NUM_NL80211_TID_STATS: number of attributes here		* @NUM_NL80211_TID_STATS: number of attributes here
	* @NL80211_TID_STATS_MAX: highest numbered attribute here		* @NL80211_TID_STATS_MAX: highest numbered attribute here
	*/		*/
	@@ -2574,6 +2582,7 @@ enum nl80211_tid_stats {
	NL80211_TID_STATS_TX_MSDU,		NL80211_TID_STATS_TX_MSDU,
	NL80211_TID_STATS_TX_MSDU_RETRIES,		NL80211_TID_STATS_TX_MSDU_RETRIES,
	NL80211_TID_STATS_TX_MSDU_FAILED,		NL80211_TID_STATS_TX_MSDU_FAILED,
			NL80211_TID_STATS_PAD,

	/* keep last */		/* keep last */
	NUM_NL80211_TID_STATS,		NUM_NL80211_TID_STATS,
	@@ -3010,6 +3019,7 @@ enum nl80211_user_reg_hint_type {
	* transmitting data (on channel or globally)		* transmitting data (on channel or globally)
	* @NL80211_SURVEY_INFO_TIME_SCAN: time the radio spent for scan		* @NL80211_SURVEY_INFO_TIME_SCAN: time the radio spent for scan
	* (on this channel or globally)		* (on this channel or globally)
			* @NL80211_SURVEY_INFO_PAD: attribute used for padding for 64-bit alignment
	* @NL80211_SURVEY_INFO_MAX: highest survey info attribute number		* @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
	* currently defined		* currently defined
	* @__NL80211_SURVEY_INFO_AFTER_LAST: internal use		* @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
	@@ -3451,6 +3461,7 @@ enum nl80211_bss_scan_width {
	* @NL80211_BSS_LAST_SEEN_BOOTTIME: CLOCK_BOOTTIME timestamp when this entry		* @NL80211_BSS_LAST_SEEN_BOOTTIME: CLOCK_BOOTTIME timestamp when this entry
	* was last updated by a received frame. The value is expected to be		* was last updated by a received frame. The value is expected to be
	* accurate to about 10ms. (u64, nanoseconds)		* accurate to about 10ms. (u64, nanoseconds)
			* @NL80211_BSS_PAD: attribute used for padding for 64-bit alignment
	* @__NL80211_BSS_AFTER_LAST: internal		* @__NL80211_BSS_AFTER_LAST: internal
	* @NL80211_BSS_MAX: highest BSS attribute		* @NL80211_BSS_MAX: highest BSS attribute
	*/		*/

net/mac80211/mlme.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2399,6 +2399,11 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
	return;		return;
	}		}

			/* AP is probably out of range (or not reachable for another reason) so
			* remove the bss struct for that AP.
			*/
			cfg80211_unlink_bss(local->hw.wiphy, ifmgd->associated);

	ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,		ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
	WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,		WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,
	true, frame_buf);		true, frame_buf);

Admin message