Merge tag 'mac80211-next-for-davem-2015-02-03' of... (940288b6) · Commits · 戴 / test

Documentation/DocBook/80211.tmpl

+2 −2

Original line number	Diff line number	Diff line
		@@ -434,7 +434,6 @@
		<section id="ps-client">
		<title>support for powersaving clients</title>
		!Pinclude/net/mac80211.h AP support for powersaving clients
		</section>
		!Finclude/net/mac80211.h ieee80211_get_buffered_bc
		!Finclude/net/mac80211.h ieee80211_beacon_get
		!Finclude/net/mac80211.h ieee80211_sta_eosp
		@@ -443,6 +442,7 @@
		!Finclude/net/mac80211.h ieee80211_sta_ps_transition_ni
		!Finclude/net/mac80211.h ieee80211_sta_set_buffered
		!Finclude/net/mac80211.h ieee80211_sta_block_awake
		</section>
		</chapter>

		<chapter id="multi-iface">
		@@ -487,8 +487,8 @@
		<title>RX A-MPDU aggregation</title>
		!Pnet/mac80211/agg-rx.c RX A-MPDU aggregation
		!Cnet/mac80211/agg-rx.c
		</sect1>
		!Finclude/net/mac80211.h ieee80211_ampdu_mlme_action
		</sect1>
		</chapter>

		<chapter id="smps">

drivers/net/wireless/ath/ath10k/mac.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -76,6 +76,9 @@ static int ath10k_send_key(struct ath10k_vif *arvif,
		if (memcmp(macaddr, arvif->vif->addr, ETH_ALEN))
		arg.key_flags = WMI_KEY_PAIRWISE;
		break;
		case WLAN_CIPHER_SUITE_AES_CMAC:
		/* this one needs to be done in software */
		return 1;
		default:
		ath10k_warn(ar, "cipher %d is not supported\n", key->cipher);
		return -EOPNOTSUPP;
		@@ -5035,6 +5038,13 @@ struct ath10k_vif ath10k_get_arvif(struct ath10k ar, u32 vdev_id)

		int ath10k_mac_register(struct ath10k *ar)
		{
		static const u32 cipher_suites[] = {
		WLAN_CIPHER_SUITE_WEP40,
		WLAN_CIPHER_SUITE_WEP104,
		WLAN_CIPHER_SUITE_TKIP,
		WLAN_CIPHER_SUITE_CCMP,
		WLAN_CIPHER_SUITE_AES_CMAC,
		};
		struct ieee80211_supported_band *band;
		struct ieee80211_sta_vht_cap vht_cap;
		struct ieee80211_sta_ht_cap ht_cap;
		@@ -5108,7 +5118,8 @@ int ath10k_mac_register(struct ath10k *ar)
		IEEE80211_HW_REPORTS_TX_ACK_STATUS \|
		IEEE80211_HW_HAS_RATE_CONTROL \|
		IEEE80211_HW_AP_LINK_PS \|
		IEEE80211_HW_SPECTRUM_MGMT;
		IEEE80211_HW_SPECTRUM_MGMT \|
		IEEE80211_HW_SW_CRYPTO_CONTROL;

		ar->hw->wiphy->features \|= NL80211_FEATURE_STATIC_SMPS;

		@@ -5182,6 +5193,9 @@ int ath10k_mac_register(struct ath10k *ar)
		goto err_free;
		}

		ar->hw->wiphy->cipher_suites = cipher_suites;
		ar->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);

		ret = ieee80211_register_hw(ar->hw);
		if (ret) {
		ath10k_err(ar, "failed to register ieee80211: %d\n", ret);

include/linux/ieee80211.h

+27 −0

Original line number	Diff line number	Diff line
		@@ -1017,6 +1017,15 @@ struct ieee80211_mmie {
		u8 mic[8];
		} __packed;

		/* Management MIC information element (IEEE 802.11w) for GMAC and CMAC-256 */
		struct ieee80211_mmie_16 {
		u8 element_id;
		u8 length;
		__le16 key_id;
		u8 sequence_number[6];
		u8 mic[16];
		} __packed;

		struct ieee80211_vendor_ie {
		u8 element_id;
		u8 len;
		@@ -1994,9 +2003,15 @@ enum ieee80211_key_len {
		WLAN_KEY_LEN_WEP40 = 5,
		WLAN_KEY_LEN_WEP104 = 13,
		WLAN_KEY_LEN_CCMP = 16,
		WLAN_KEY_LEN_CCMP_256 = 32,
		WLAN_KEY_LEN_TKIP = 32,
		WLAN_KEY_LEN_AES_CMAC = 16,
		WLAN_KEY_LEN_SMS4 = 32,
		WLAN_KEY_LEN_GCMP = 16,
		WLAN_KEY_LEN_GCMP_256 = 32,
		WLAN_KEY_LEN_BIP_CMAC_256 = 32,
		WLAN_KEY_LEN_BIP_GMAC_128 = 16,
		WLAN_KEY_LEN_BIP_GMAC_256 = 32,
		};

		#define IEEE80211_WEP_IV_LEN 4
		@@ -2004,9 +2019,16 @@ enum ieee80211_key_len {
		#define IEEE80211_CCMP_HDR_LEN 8
		#define IEEE80211_CCMP_MIC_LEN 8
		#define IEEE80211_CCMP_PN_LEN 6
		#define IEEE80211_CCMP_256_HDR_LEN 8
		#define IEEE80211_CCMP_256_MIC_LEN 16
		#define IEEE80211_CCMP_256_PN_LEN 6
		#define IEEE80211_TKIP_IV_LEN 8
		#define IEEE80211_TKIP_ICV_LEN 4
		#define IEEE80211_CMAC_PN_LEN 6
		#define IEEE80211_GMAC_PN_LEN 6
		#define IEEE80211_GCMP_HDR_LEN 8
		#define IEEE80211_GCMP_MIC_LEN 16
		#define IEEE80211_GCMP_PN_LEN 6

		/* Public action codes */
		enum ieee80211_pub_actioncode {
		@@ -2230,6 +2252,11 @@ enum ieee80211_sa_query_action {
		#define WLAN_CIPHER_SUITE_WEP104 0x000FAC05
		#define WLAN_CIPHER_SUITE_AES_CMAC 0x000FAC06
		#define WLAN_CIPHER_SUITE_GCMP 0x000FAC08
		#define WLAN_CIPHER_SUITE_GCMP_256 0x000FAC09
		#define WLAN_CIPHER_SUITE_CCMP_256 0x000FAC0A
		#define WLAN_CIPHER_SUITE_BIP_GMAC_128 0x000FAC0B
		#define WLAN_CIPHER_SUITE_BIP_GMAC_256 0x000FAC0C
		#define WLAN_CIPHER_SUITE_BIP_CMAC_256 0x000FAC0D

		#define WLAN_CIPHER_SUITE_SMS4 0x00147201

include/net/cfg80211.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -1493,6 +1493,10 @@ struct cfg80211_match_set {
		* @rcu_head: RCU callback used to free the struct
		* @owner_nlportid: netlink portid of owner (if this should is a request
		* owned by a particular socket)
		* @delay: delay in seconds to use before starting the first scan
		* cycle. The driver may ignore this parameter and start
		* immediately (or at any other time), if this feature is not
		* supported.
		*/
		struct cfg80211_sched_scan_request {
		struct cfg80211_ssid *ssids;
		@@ -1506,6 +1510,7 @@ struct cfg80211_sched_scan_request {
		struct cfg80211_match_set *match_sets;
		int n_match_sets;
		s32 min_rssi_thold;
		u32 delay;

		u8 mac_addr[ETH_ALEN] __aligned(2);
		u8 mac_addr_mask[ETH_ALEN] __aligned(2);

include/net/mac80211.h

+34 −5

Original line number	Diff line number	Diff line
		@@ -376,6 +376,12 @@ enum ieee80211_rssi_event {
		* @ssid_len: Length of SSID given in @ssid.
		* @hidden_ssid: The SSID of the current vif is hidden. Only valid in AP-mode.
		* @txpower: TX power in dBm
		* @txpower_type: TX power adjustment used to control per packet Transmit
		* Power Control (TPC) in lower driver for the current vif. In particular
		* TPC is enabled if value passed in %txpower_type is
		* NL80211_TX_POWER_LIMITED (allow using less than specified from
		* userspace), whereas TPC is disabled if %txpower_type is set to
		* NL80211_TX_POWER_FIXED (use value configured from userspace)
		* @p2p_noa_attr: P2P NoA attribute for P2P powersave
		*/
		struct ieee80211_bss_conf {
		@@ -411,6 +417,7 @@ struct ieee80211_bss_conf {
		size_t ssid_len;
		bool hidden_ssid;
		int txpower;
		enum nl80211_tx_power_setting txpower_type;
		struct ieee80211_p2p_noa_attr p2p_noa_attr;
		};

		@@ -1287,8 +1294,8 @@ struct ieee80211_vif wdev_to_ieee80211_vif(struct wireless_dev wdev);
		* @IEEE80211_KEY_FLAG_PAIRWISE: Set by mac80211, this flag indicates
		* that the key is pairwise rather then a shared key.
		* @IEEE80211_KEY_FLAG_SW_MGMT_TX: This flag should be set by the driver for a
		* CCMP key if it requires CCMP encryption of management frames (MFP) to
		* be done in software.
		* CCMP/GCMP key if it requires CCMP/GCMP encryption of management frames
		* (MFP) to be done in software.
		* @IEEE80211_KEY_FLAG_PUT_IV_SPACE: This flag should be set by the driver
		* if space should be prepared for the IV, but the IV
		* itself should not be generated. Do not set together with
		@@ -1303,7 +1310,7 @@ struct ieee80211_vif wdev_to_ieee80211_vif(struct wireless_dev wdev);
		* RX, if your crypto engine can't deal with TX you can also set the
		* %IEEE80211_KEY_FLAG_SW_MGMT_TX flag to encrypt such frames in SW.
		* @IEEE80211_KEY_FLAG_GENERATE_IV_MGMT: This flag should be set by the
		* driver for a CCMP key to indicate that is requires IV generation
		* driver for a CCMP/GCMP key to indicate that is requires IV generation
		* only for managment frames (MFP).
		* @IEEE80211_KEY_FLAG_RESERVE_TAILROOM: This flag should be set by the
		* driver for a key to indicate that sufficient tailroom must always
		@@ -1634,6 +1641,12 @@ struct ieee80211_tx_control {
		* be created. It is expected user-space will create vifs as
		* desired (and thus have them named as desired).
		*
		* @IEEE80211_HW_SW_CRYPTO_CONTROL: The driver wants to control which of the
		* crypto algorithms can be done in software - so don't automatically
		* try to fall back to it if hardware crypto fails, but do so only if
		* the driver returns 1. This also forces the driver to advertise its
		* supported cipher suites.
		*
		* @IEEE80211_HW_QUEUE_CONTROL: The driver wants to control per-interface
		* queue mapping in order to use different queues (not just one per AC)
		* for different virtual interfaces. See the doc section on HW queue
		@@ -1681,6 +1694,7 @@ enum ieee80211_hw_flags {
		IEEE80211_HW_MFP_CAPABLE = 1<<13,
		IEEE80211_HW_WANT_MONITOR_VIF = 1<<14,
		IEEE80211_HW_NO_AUTO_VIF = 1<<15,
		IEEE80211_HW_SW_CRYPTO_CONTROL = 1<<16,
		/* free slots */
		IEEE80211_HW_REPORTS_TX_ACK_STATUS = 1<<18,
		IEEE80211_HW_CONNECTION_MONITOR = 1<<19,
		@@ -1955,6 +1969,11 @@ void ieee80211_free_txskb(struct ieee80211_hw hw, struct sk_buff skb);
		* added; if you return 0 then hw_key_idx must be assigned to the
		* hardware key index, you are free to use the full u8 range.
		*
		* Note that in the case that the @IEEE80211_HW_SW_CRYPTO_CONTROL flag is
		* set, mac80211 will not automatically fall back to software crypto if
		* enabling hardware crypto failed. The set_key() call may also return the
		* value 1 to permit this specific key/algorithm to be done in software.
		*
		* When the cmd is %DISABLE_KEY then it must succeed.
		*
		* Note that it is permissible to not decrypt a frame even if a key
		@@ -4079,6 +4098,10 @@ void ieee80211_aes_cmac_calculate_k1_k2(struct ieee80211_key_conf *keyconf,
		* reverse order than in packet)
		* @aes_cmac: PN data, most significant byte first (big endian,
		* reverse order than in packet)
		* @aes_gmac: PN data, most significant byte first (big endian,
		* reverse order than in packet)
		* @gcmp: PN data, most significant byte first (big endian,
		* reverse order than in packet)
		*/
		struct ieee80211_key_seq {
		union {
		@@ -4092,6 +4115,12 @@ struct ieee80211_key_seq {
		struct {
		u8 pn[6];
		} aes_cmac;
		struct {
		u8 pn[6];
		} aes_gmac;
		struct {
		u8 pn[6];
		} gcmp;
		};
		};

		@@ -4116,7 +4145,7 @@ void ieee80211_get_key_tx_seq(struct ieee80211_key_conf *keyconf,
		* ieee80211_get_key_rx_seq - get key RX sequence counter
		*
		* @keyconf: the parameter passed with the set key
		* @tid: The TID, or -1 for the management frame value (CCMP only);
		* @tid: The TID, or -1 for the management frame value (CCMP/GCMP only);
		* the value on TID 0 is also used for non-QoS frames. For
		* CMAC, only TID 0 is valid.
		* @seq: buffer to receive the sequence data
		@@ -4152,7 +4181,7 @@ void ieee80211_set_key_tx_seq(struct ieee80211_key_conf *keyconf,
		* ieee80211_set_key_rx_seq - set key RX sequence counter
		*
		* @keyconf: the parameter passed with the set key
		* @tid: The TID, or -1 for the management frame value (CCMP only);
		* @tid: The TID, or -1 for the management frame value (CCMP/GCMP only);
		* the value on TID 0 is also used for non-QoS frames. For
		* CMAC, only TID 0 is valid.
		* @seq: new sequence data

Admin message