Merge tag 'mac80211-next-for-davem-2017-06-13' of... (0e74008b) · Commits · e / devices / android_kernel_oneplus_sm8150

include/linux/ieee80211.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -2400,7 +2400,11 @@ enum ieee80211_sa_query_action {

		#define WLAN_MAX_KEY_LEN 32

		#define WLAN_PMK_NAME_LEN 16
		#define WLAN_PMKID_LEN 16
		#define WLAN_PMK_LEN_EAP_LEAP 16
		#define WLAN_PMK_LEN 32
		#define WLAN_PMK_LEN_SUITE_B_192 48

		#define WLAN_OUI_WFA 0x506f9a
		#define WLAN_OUI_TYPE_WFA_P2P 9

include/linux/skbuff.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -1904,6 +1904,15 @@ static inline unsigned char __skb_put(struct sk_buff skb, unsigned int len)
		return tmp;
		}

		static inline unsigned char skb_put_zero(struct sk_buff skb, unsigned int len)
		{
		unsigned char *tmp = skb_put(skb, len);

		memset(tmp, 0, len);

		return tmp;
		}

		unsigned char skb_push(struct sk_buff skb, unsigned int len);
		static inline unsigned char __skb_push(struct sk_buff skb, unsigned int len)
		{

include/net/cfg80211.h

+42 −0

Original line number	Diff line number	Diff line
		@@ -649,6 +649,7 @@ struct survey_info {
		* @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
		* @psk: PSK (for devices supporting 4-way-handshake offload)
		*/
		struct cfg80211_crypto_settings {
		u32 wpa_versions;
		@@ -662,6 +663,7 @@ struct cfg80211_crypto_settings {
		bool control_port_no_encrypt;
		struct key_params *wep_keys;
		int wep_tx_key;
		const u8 *psk;
		};

		/**
		@@ -1441,6 +1443,9 @@ struct mesh_config {
		* @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a]
		* @basic_rates: basic rates to use when creating the mesh
		* @beacon_rate: bitrate to be used for beacons
		* @userspace_handles_dfs: whether user space controls DFS operation, i.e.
		* changes the channel when a radar is detected. This is required
		* to operate on DFS channels.
		*
		* These parameters are fixed when the mesh is created.
		*/
		@@ -1462,6 +1467,7 @@ struct mesh_setup {
		int mcast_rate[NUM_NL80211_BANDS];
		u32 basic_rates;
		struct cfg80211_bitrate_mask beacon_rate;
		bool userspace_handles_dfs;
		};

		/**
		@@ -2106,6 +2112,8 @@ struct cfg80211_bss_selection {
		* @fils_erp_rrk: ERP re-authentication Root Key (rRK) used to derive additional
		* keys in FILS or %NULL if not specified.
		* @fils_erp_rrk_len: Length of @fils_erp_rrk in octets.
		* @want_1x: indicates user-space supports and wants to use 802.1X driver
		* offload of 4-way handshake.
		*/
		struct cfg80211_connect_params {
		struct ieee80211_channel *channel;
		@@ -2138,6 +2146,7 @@ struct cfg80211_connect_params {
		u16 fils_erp_next_seq_num;
		const u8 *fils_erp_rrk;
		size_t fils_erp_rrk_len;
		bool want_1x;
		};

		/**
		@@ -2559,6 +2568,23 @@ struct cfg80211_nan_func {
		u64 cookie;
		};

		/**
		* struct cfg80211_pmk_conf - PMK configuration
		*
		* @aa: authenticator address
		* @pmk_len: PMK length in bytes.
		* @pmk: the PMK material
		* @pmk_r0_name: PMK-R0 Name. NULL if not applicable (i.e., the PMK
		* is not PMK-R0). When pmk_r0_name is not NULL, the pmk field
		* holds PMK-R0.
		*/
		struct cfg80211_pmk_conf {
		const u8 *aa;
		u8 pmk_len;
		const u8 *pmk;
		const u8 *pmk_r0_name;
		};

		/**
		* struct cfg80211_ops - backend description for wireless configuration
		*
		@@ -2875,6 +2901,13 @@ struct cfg80211_nan_func {
		* All other parameters must be ignored.
		*
		* @set_multicast_to_unicast: configure multicast to unicast conversion for BSS
		*
		* @set_pmk: configure the PMK to be used for offloaded 802.1X 4-Way handshake.
		* If not deleted through @del_pmk the PMK remains valid until disconnect
		* upon which the driver should clear it.
		* (invoked with the wireless_dev mutex held)
		* @del_pmk: delete the previously configured PMK for the given authenticator.
		* (invoked with the wireless_dev mutex held)
		*/
		struct cfg80211_ops {
		int (suspend)(struct wiphy wiphy, struct cfg80211_wowlan *wow);
		@@ -3163,6 +3196,11 @@ struct cfg80211_ops {
		int (set_multicast_to_unicast)(struct wiphy wiphy,
		struct net_device *dev,
		const bool enabled);

		int (set_pmk)(struct wiphy wiphy, struct net_device *dev,
		const struct cfg80211_pmk_conf *conf);
		int (del_pmk)(struct wiphy wiphy, struct net_device *dev,
		const u8 *aa);
		};

		/*
		@@ -5403,6 +5441,9 @@ cfg80211_connect_timeout(struct net_device dev, const u8 bssid,
		* @req_ie_len: association request IEs length
		* @resp_ie: association response IEs (may be %NULL)
		* @resp_ie_len: assoc response IEs length
		* @authorized: true if the 802.1X authentication was done by the driver or is
		* not needed (e.g., when Fast Transition protocol was used), false
		* otherwise. Ignored for networks that don't use 802.1X authentication.
		*/
		struct cfg80211_roam_info {
		struct ieee80211_channel *channel;
		@@ -5412,6 +5453,7 @@ struct cfg80211_roam_info {
		size_t req_ie_len;
		const u8 *resp_ie;
		size_t resp_ie_len;
		bool authorized;
		};

		/**

include/net/mac80211.h

+33 −4

Original line number	Diff line number	Diff line
		@@ -4204,6 +4204,22 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif,
		struct ieee80211_tx_rate *dest,
		int max_rates);

		/**
		* ieee80211_sta_set_expected_throughput - set the expected tpt for a station
		*
		* Call this function to notify mac80211 about a change in expected throughput
		* to a station. A driver for a device that does rate control in firmware can
		* call this function when the expected throughput estimate towards a station
		* changes. The information is used to tune the CoDel AQM applied to traffic
		* going towards that station (which can otherwise be too aggressive and cause
		* slow stations to starve).
		*
		* @pubsta: the station to set throughput for.
		* @thr: the current expected throughput in kbps.
		*/
		void ieee80211_sta_set_expected_throughput(struct ieee80211_sta *pubsta,
		u32 thr);

		/**
		* ieee80211_tx_status - transmit status callback
		*
		@@ -5436,6 +5452,9 @@ void ieee80211_mark_rx_ba_filtered_frames(struct ieee80211_sta *pubsta, u8 tid,
		*/
		void ieee80211_send_bar(struct ieee80211_vif vif, u8 ra, u16 tid, u16 ssn);

		void ieee80211_manage_rx_ba_offl(struct ieee80211_vif vif, const u8 addr,
		unsigned int bit);

		/**
		* ieee80211_start_rx_ba_session_offl - start a Rx BA session
		*
		@@ -5450,8 +5469,13 @@ void ieee80211_send_bar(struct ieee80211_vif vif, u8 ra, u16 tid, u16 ssn);
		* @addr: station mac address
		* @tid: the rx tid
		*/
		void ieee80211_start_rx_ba_session_offl(struct ieee80211_vif *vif,
		const u8 *addr, u16 tid);
		static inline void ieee80211_start_rx_ba_session_offl(struct ieee80211_vif *vif,
		const u8 *addr, u16 tid)
		{
		if (WARN_ON(tid >= IEEE80211_NUM_TIDS))
		return;
		ieee80211_manage_rx_ba_offl(vif, addr, tid);
		}

		/**
		* ieee80211_stop_rx_ba_session_offl - stop a Rx BA session
		@@ -5467,8 +5491,13 @@ void ieee80211_start_rx_ba_session_offl(struct ieee80211_vif *vif,
		* @addr: station mac address
		* @tid: the rx tid
		*/
		void ieee80211_stop_rx_ba_session_offl(struct ieee80211_vif *vif,
		const u8 *addr, u16 tid);
		static inline void ieee80211_stop_rx_ba_session_offl(struct ieee80211_vif *vif,
		const u8 *addr, u16 tid)
		{
		if (WARN_ON(tid >= IEEE80211_NUM_TIDS))
		return;
		ieee80211_manage_rx_ba_offl(vif, addr, tid + IEEE80211_NUM_TIDS);
		}

		/* Rate control API */

include/uapi/linux/nl80211.h

+69 −4

Original line number	Diff line number	Diff line
		@@ -172,6 +172,29 @@
		* Multiple such rules can be created.
		*/

		/**
		* DOC: WPA/WPA2 EAPOL handshake offload
		*
		* By setting @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK flag drivers
		* can indicate they support offloading EAPOL handshakes for WPA/WPA2
		* preshared key authentication. In %NL80211_CMD_CONNECT the preshared
		* key should be specified using %NL80211_ATTR_PMK. Drivers supporting
		* this offload may reject the %NL80211_CMD_CONNECT when no preshared
		* key material is provided, for example when that driver does not
		* support setting the temporal keys through %CMD_NEW_KEY.
		*
		* Similarly @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X flag can be
		* set by drivers indicating offload support of the PTK/GTK EAPOL
		* handshakes during 802.1X authentication. In order to use the offload
		* the %NL80211_CMD_CONNECT should have %NL80211_ATTR_WANT_1X_4WAY_HS
		* attribute flag. Drivers supporting this offload may reject the
		* %NL80211_CMD_CONNECT when the attribute flag is not present.
		*
		* For 802.1X the PMK or PMK-R0 are set by providing %NL80211_ATTR_PMK
		* using %NL80211_CMD_SET_PMK. For offloaded FT support also
		* %NL80211_ATTR_PMKR0_NAME must be provided.
		*/

		/**
		* DOC: FILS shared key authentication offload
		*
		@@ -546,8 +569,13 @@
		* authentication/association or not receiving a response from the AP.
		* Non-zero %NL80211_ATTR_STATUS_CODE value is indicated in that case as
		* well to remain backwards compatible.
		* @NL80211_CMD_ROAM: request that the card roam (currently not implemented),
		* sent as an event when the card/driver roamed by itself.
		* @NL80211_CMD_ROAM: notifcation indicating the card/driver roamed by itself.
		* When the driver roamed in a network that requires 802.1X authentication,
		* %NL80211_ATTR_PORT_AUTHORIZED should be set if the 802.1X authentication
		* was done by the driver or if roaming was done using Fast Transition
		* protocol (in which case 802.1X authentication is not needed). If
		* %NL80211_ATTR_PORT_AUTHORIZED is not set, user space is responsible for
		* the 802.1X authentication.
		* @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify
		* userspace that a connection was dropped by the AP or due to other
		* reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and
		@@ -947,6 +975,14 @@
		* does not result in a change for the current association. Currently,
		* only the %NL80211_ATTR_IE data is used and updated with this command.
		*
		* @NL80211_CMD_SET_PMK: For offloaded 4-Way handshake, set the PMK or PMK-R0
		* for the given authenticator address (specified with &NL80211_ATTR_MAC).
		* When &NL80211_ATTR_PMKR0_NAME is set, &NL80211_ATTR_PMK specifies the
		* PMK-R0, otherwise it specifies the PMK.
		* @NL80211_CMD_DEL_PMK: For offloaded 4-Way handshake, delete the previously
		* configured PMK for the authenticator address identified by
		* &NL80211_ATTR_MAC.
		*
		* @NL80211_CMD_MAX: highest used command number
		* @__NL80211_CMD_AFTER_LAST: internal use
		*/
		@@ -1146,6 +1182,9 @@ enum nl80211_commands {

		NL80211_CMD_UPDATE_CONNECT_PARAMS,

		NL80211_CMD_SET_PMK,
		NL80211_CMD_DEL_PMK,

		/* add new commands above here */

		/* used to define NL80211_CMD_MAX below */
		@@ -2080,14 +2119,27 @@ enum nl80211_commands {
		* identifying the scope of PMKSAs. This is used with
		* @NL80211_CMD_SET_PMKSA and @NL80211_CMD_DEL_PMKSA.
		*
		* @NL80211_ATTR_PMK: PMK for the PMKSA identified by %NL80211_ATTR_PMKID.
		* This is used with @NL80211_CMD_SET_PMKSA.
		* @NL80211_ATTR_PMK: attribute for passing PMK key material. Used with
		* %NL80211_CMD_SET_PMKSA for the PMKSA identified by %NL80211_ATTR_PMKID.
		* For %NL80211_CMD_CONNECT it is used to provide PSK for offloading 4-way
		* handshake for WPA/WPA2-PSK networks. For 802.1X authentication it is
		* used with %NL80211_CMD_SET_PMK. For offloaded FT support this attribute
		* specifies the PMK-R0 if NL80211_ATTR_PMKR0_NAME is included as well.
		*
		* @NL80211_ATTR_SCHED_SCAN_MULTI: flag attribute which user-space shall use to
		* indicate that it supports multiple active scheduled scan requests.
		* @NL80211_ATTR_SCHED_SCAN_MAX_REQS: indicates maximum number of scheduled
		* scan request that may be active for the device (u32).
		*
		* @NL80211_ATTR_WANT_1X_4WAY_HS: flag attribute which user-space can include
		* in %NL80211_CMD_CONNECT to indicate that for 802.1X authentication it
		* wants to use the supported offload of the 4-way handshake.
		* @NL80211_ATTR_PMKR0_NAME: PMK-R0 Name for offloaded FT.
		* @NL80211_ATTR_PORT_AUTHORIZED: flag attribute used in %NL80211_CMD_ROAMED
		* notification indicating that that 802.1X authentication was done by
		* the driver or is not needed (because roaming used the Fast Transition
		* protocol).
		*
		* @NUM_NL80211_ATTR: total number of nl80211_attrs available
		* @NL80211_ATTR_MAX: highest attribute number currently defined
		* @__NL80211_ATTR_AFTER_LAST: internal use
		@@ -2510,6 +2562,10 @@ enum nl80211_attrs {
		NL80211_ATTR_SCHED_SCAN_MULTI,
		NL80211_ATTR_SCHED_SCAN_MAX_REQS,

		NL80211_ATTR_WANT_1X_4WAY_HS,
		NL80211_ATTR_PMKR0_NAME,
		NL80211_ATTR_PORT_AUTHORIZED,

		/* add attributes here, update the policy in nl80211.c */

		__NL80211_ATTR_AFTER_LAST,
		@@ -4852,6 +4908,13 @@ enum nl80211_feature_flags {
		* RSSI threshold values to monitor rather than exactly one threshold.
		* @NL80211_EXT_FEATURE_FILS_SK_OFFLOAD: Driver SME supports FILS shared key
		* authentication with %NL80211_CMD_CONNECT.
		* @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK: Device wants to do 4-way
		* handshake with PSK in station mode (PSK is passed as part of the connect
		* and associate commands), doing it in the host might not be supported.
		* @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X: Device wants to do doing 4-way
		* handshake with 802.1X in station mode (will pass EAP frames to the host
		* and accept the set_pmk/del_pmk commands), doing it in the host might not
		* be supported.
		*
		* @NUM_NL80211_EXT_FEATURES: number of extended features.
		* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
		@@ -4872,6 +4935,8 @@ enum nl80211_ext_feature_index {
		NL80211_EXT_FEATURE_SCHED_SCAN_RELATIVE_RSSI,
		NL80211_EXT_FEATURE_CQM_RSSI_LIST,
		NL80211_EXT_FEATURE_FILS_SK_OFFLOAD,
		NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK,
		NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X,

		/* add new features before the definition below */
		NUM_NL80211_EXT_FEATURES,