Merge tag 'mac80211-next-for-davem-2018-05-23' of... (5ee6ad20) · Commits · 戴 / test

drivers/net/wireless/ath/ath9k/main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2544,7 +2544,8 @@ static void ath9k_unassign_vif_chanctx(struct ieee80211_hw *hw,
		}

		static void ath9k_mgd_prepare_tx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif)
		struct ieee80211_vif *vif,
		u16 duration)
		{
		struct ath_softc *sc = hw->priv;
		struct ath_common *common = ath9k_hw_common(sc->sc_ah);

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -2844,7 +2844,8 @@ static int iwl_mvm_mac_conf_tx(struct ieee80211_hw *hw,
		}

		static void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif)
		struct ieee80211_vif *vif,
		u16 req_duration)
		{
		struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
		u32 duration = IWL_MVM_TE_SESSION_PROTECTION_MAX_TIME_MS;
		@@ -2857,6 +2858,9 @@ static void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw,
		if (iwl_mvm_ref_sync(mvm, IWL_MVM_REF_PREPARE_TX))
		return;

		if (req_duration > duration)
		duration = req_duration;

		mutex_lock(&mvm->mutex);
		/* Try really hard to protect the session and hear a beacon */
		iwl_mvm_protect_session(mvm, vif, duration, min_duration, 500, false);

drivers/net/wireless/mac80211_hwsim.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2650,6 +2650,7 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
		ieee80211_hw_set(hw, AMPDU_AGGREGATION);
		ieee80211_hw_set(hw, MFP_CAPABLE);
		ieee80211_hw_set(hw, SIGNAL_DBM);
		ieee80211_hw_set(hw, SUPPORTS_PS);
		ieee80211_hw_set(hw, TDLS_WIDER_BW);
		if (rctbl)
		ieee80211_hw_set(hw, SUPPORTS_RC_TABLE);

include/net/cfg80211.h

+112 −19

Original line number	Diff line number	Diff line
		@@ -1079,6 +1079,37 @@ struct sta_bss_parameters {
		u16 beacon_interval;
		};

		/**
		* struct cfg80211_txq_stats - TXQ statistics for this TID
		* @filled: bitmap of flags using the bits of &enum nl80211_txq_stats to
		* indicate the relevant values in this struct are filled
		* @backlog_bytes: total number of bytes currently backlogged
		* @backlog_packets: total number of packets currently backlogged
		* @flows: number of new flows seen
		* @drops: total number of packets dropped
		* @ecn_marks: total number of packets marked with ECN CE
		* @overlimit: number of drops due to queue space overflow
		* @overmemory: number of drops due to memory limit overflow
		* @collisions: number of hash collisions
		* @tx_bytes: total number of bytes dequeued
		* @tx_packets: total number of packets dequeued
		* @max_flows: maximum number of flows supported
		*/
		struct cfg80211_txq_stats {
		u32 filled;
		u32 backlog_bytes;
		u32 backlog_packets;
		u32 flows;
		u32 drops;
		u32 ecn_marks;
		u32 overlimit;
		u32 overmemory;
		u32 collisions;
		u32 tx_bytes;
		u32 tx_packets;
		u32 max_flows;
		};

		/**
		* struct cfg80211_tid_stats - per-TID statistics
		* @filled: bitmap of flags using the bits of &enum nl80211_tid_stats to
		@@ -1088,6 +1119,7 @@ struct sta_bss_parameters {
		* @tx_msdu_retries: number of retries (not counting the first) for
		* transmitted MSDUs
		* @tx_msdu_failed: number of failed transmitted MSDUs
		* @txq_stats: TXQ statistics
		*/
		struct cfg80211_tid_stats {
		u32 filled;
		@@ -1095,6 +1127,7 @@ struct cfg80211_tid_stats {
		u64 tx_msdu;
		u64 tx_msdu_retries;
		u64 tx_msdu_failed;
		struct cfg80211_txq_stats txq_stats;
		};

		#define IEEE80211_MAX_CHAINS 4
		@@ -1151,7 +1184,10 @@ struct cfg80211_tid_stats {
		* @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
		* (IEEE80211_NUM_TIDS) index for MSDUs not encapsulated in QoS-MPDUs.
		* Note that this doesn't use the @filled bit, but is used if non-NULL.
		* @ack_signal: signal strength (in dBm) of the last ACK frame.
		* @avg_ack_signal: average rssi value of ack packet for the no of msdu's has
		* been sent.
		*/
		struct station_info {
		u64 filled;
		@@ -1195,8 +1231,9 @@ struct station_info {
		u64 rx_beacon;
		u64 rx_duration;
		u8 rx_beacon_signal_avg;
		struct cfg80211_tid_stats pertid[IEEE80211_NUM_TIDS + 1];
		struct cfg80211_tid_stats *pertid;
		s8 ack_signal;
		s8 avg_ack_signal;
		};

		#if IS_ENABLED(CONFIG_CFG80211)
		@@ -2188,9 +2225,14 @@ struct cfg80211_connect_params {
		* have to be updated as part of update_connect_params() call.
		*
		* @UPDATE_ASSOC_IES: Indicates whether association request IEs are updated
		* @UPDATE_FILS_ERP_INFO: Indicates that FILS connection parameters (realm,
		* username, erp sequence number and rrk) are updated
		* @UPDATE_AUTH_TYPE: Indicates that authentication type is updated
		*/
		enum cfg80211_connect_params_changed {
		UPDATE_ASSOC_IES = BIT(0),
		UPDATE_FILS_ERP_INFO = BIT(1),
		UPDATE_AUTH_TYPE = BIT(2),
		};

		/**
		@@ -2201,6 +2243,9 @@ enum cfg80211_connect_params_changed {
		* @WIPHY_PARAM_RTS_THRESHOLD: wiphy->rts_threshold has changed
		* @WIPHY_PARAM_COVERAGE_CLASS: coverage class changed
		* @WIPHY_PARAM_DYN_ACK: dynack has been enabled
		* @WIPHY_PARAM_TXQ_LIMIT: TXQ packet limit has been changed
		* @WIPHY_PARAM_TXQ_MEMORY_LIMIT: TXQ memory limit has been changed
		* @WIPHY_PARAM_TXQ_QUANTUM: TXQ scheduler quantum
		*/
		enum wiphy_params_flags {
		WIPHY_PARAM_RETRY_SHORT = 1 << 0,
		@@ -2209,6 +2254,9 @@ enum wiphy_params_flags {
		WIPHY_PARAM_RTS_THRESHOLD = 1 << 3,
		WIPHY_PARAM_COVERAGE_CLASS = 1 << 4,
		WIPHY_PARAM_DYN_ACK = 1 << 5,
		WIPHY_PARAM_TXQ_LIMIT = 1 << 6,
		WIPHY_PARAM_TXQ_MEMORY_LIMIT = 1 << 7,
		WIPHY_PARAM_TXQ_QUANTUM = 1 << 8,
		};

		/**
		@@ -2961,6 +3009,9 @@ struct cfg80211_external_auth_params {
		*
		* @set_multicast_to_unicast: configure multicast to unicast conversion for BSS
		*
		* @get_txq_stats: Get TXQ stats for interface or phy. If wdev is %NULL, this
		* function should return phy stats, and interface stats otherwise.
		*
		* @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.
		@@ -3262,6 +3313,10 @@ struct cfg80211_ops {
		struct net_device *dev,
		const bool enabled);

		int (get_txq_stats)(struct wiphy wiphy,
		struct wireless_dev *wdev,
		struct cfg80211_txq_stats *txqstats);

		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,
		@@ -3806,6 +3861,10 @@ struct wiphy_iftype_ext_capab {
		* bitmap of &enum nl80211_band values. For instance, for
		* NL80211_BAND_2GHZ, bit 0 would be set
		* (i.e. BIT(NL80211_BAND_2GHZ)).
		*
		* @txq_limit: configuration of internal TX queue frame limit
		* @txq_memory_limit: configuration internal TX queue memory limit
		* @txq_quantum: configuration of internal TX queue scheduler quantum
		*/
		struct wiphy {
		/* assign these fields before you register the wiphy */
		@@ -3940,6 +3999,10 @@ struct wiphy {

		u8 nan_supported_bands;

		u32 txq_limit;
		u32 txq_memory_limit;
		u32 txq_quantum;

		char priv[0] __aligned(NETDEV_ALIGN);
		};

		@@ -5362,6 +5425,30 @@ static inline void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)
		#define CFG80211_TESTMODE_DUMP(cmd)
		#endif

		/**
		* struct cfg80211_fils_resp_params - FILS connection response params
		* @kek: KEK derived from a successful FILS connection (may be %NULL)
		* @kek_len: Length of @fils_kek in octets
		* @update_erp_next_seq_num: Boolean value to specify whether the value in
		* @erp_next_seq_num is valid.
		* @erp_next_seq_num: The next sequence number to use in ERP message in
		* FILS Authentication. This value should be specified irrespective of the
		* status for a FILS connection.
		* @pmk: A new PMK if derived from a successful FILS connection (may be %NULL).
		* @pmk_len: Length of @pmk in octets
		* @pmkid: A new PMKID if derived from a successful FILS connection or the PMKID
		* used for this FILS connection (may be %NULL).
		*/
		struct cfg80211_fils_resp_params {
		const u8 *kek;
		size_t kek_len;
		bool update_erp_next_seq_num;
		u16 erp_next_seq_num;
		const u8 *pmk;
		size_t pmk_len;
		const u8 *pmkid;
		};

		/**
		* struct cfg80211_connect_resp_params - Connection response params
		* @status: Status code, %WLAN_STATUS_SUCCESS for successful connection, use
		@@ -5380,17 +5467,7 @@ static inline void cfg80211_testmode_event(struct sk_buff *skb, gfp_t gfp)
		* @req_ie_len: Association request IEs length
		* @resp_ie: Association response IEs (may be %NULL)
		* @resp_ie_len: Association response IEs length
		* @fils_kek: KEK derived from a successful FILS connection (may be %NULL)
		* @fils_kek_len: Length of @fils_kek in octets
		* @update_erp_next_seq_num: Boolean value to specify whether the value in
		* @fils_erp_next_seq_num is valid.
		* @fils_erp_next_seq_num: The next sequence number to use in ERP message in
		* FILS Authentication. This value should be specified irrespective of the
		* status for a FILS connection.
		* @pmk: A new PMK if derived from a successful FILS connection (may be %NULL).
		* @pmk_len: Length of @pmk in octets
		* @pmkid: A new PMKID if derived from a successful FILS connection or the PMKID
		* used for this FILS connection (may be %NULL).
		* @fils: FILS connection response parameters.
		* @timeout_reason: Reason for connection timeout. This is used when the
		* connection fails due to a timeout instead of an explicit rejection from
		* the AP. %NL80211_TIMEOUT_UNSPECIFIED is used when the timeout reason is
		@@ -5406,13 +5483,7 @@ struct cfg80211_connect_resp_params {
		size_t req_ie_len;
		const u8 *resp_ie;
		size_t resp_ie_len;
		const u8 *fils_kek;
		size_t fils_kek_len;
		bool update_erp_next_seq_num;
		u16 fils_erp_next_seq_num;
		const u8 *pmk;
		size_t pmk_len;
		const u8 *pmkid;
		struct cfg80211_fils_resp_params fils;
		enum nl80211_timeout_reason timeout_reason;
		};

		@@ -5558,6 +5629,7 @@ 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
		* @fils: FILS related roaming information.
		*/
		struct cfg80211_roam_info {
		struct ieee80211_channel *channel;
		@@ -5567,6 +5639,7 @@ struct cfg80211_roam_info {
		size_t req_ie_len;
		const u8 *resp_ie;
		size_t resp_ie_len;
		struct cfg80211_fils_resp_params fils;
		};

		/**
		@@ -5648,6 +5721,26 @@ void cfg80211_remain_on_channel_expired(struct wireless_dev *wdev, u64 cookie,
		struct ieee80211_channel *chan,
		gfp_t gfp);

		/**
		* cfg80211_sinfo_alloc_tid_stats - allocate per-tid statistics.
		*
		* @sinfo: the station information
		* @gfp: allocation flags
		*/
		int cfg80211_sinfo_alloc_tid_stats(struct station_info *sinfo, gfp_t gfp);

		/**
		* cfg80211_sinfo_release_content - release contents of station info
		* @sinfo: the station information
		*
		* Releases any potentially allocated sub-information of the station
		* information, but not the struct itself (since it's typically on
		* the stack.)
		*/
		static inline void cfg80211_sinfo_release_content(struct station_info *sinfo)
		{
		kfree(sinfo->pertid);
		}

		/**
		* cfg80211_new_sta - notify userspace about station

include/net/mac80211.h

+17 −1

Original line number	Diff line number	Diff line
		@@ -3378,6 +3378,8 @@ enum ieee80211_reconfig_type {
		* frame in case that no beacon was heard from the AP/P2P GO.
		* The callback will be called before each transmission and upon return
		* mac80211 will transmit the frame right away.
		* If duration is greater than zero, mac80211 hints to the driver the
		* duration for which the operation is requested.
		* The callback is optional and can (should!) sleep.
		*
		* @mgd_protect_tdls_discover: Protect a TDLS discovery session. After sending
		@@ -3697,7 +3699,8 @@ struct ieee80211_ops {
		u32 sset, u8 *data);

		void (mgd_prepare_tx)(struct ieee80211_hw hw,
		struct ieee80211_vif *vif);
		struct ieee80211_vif *vif,
		u16 duration);

		void (mgd_protect_tdls_discover)(struct ieee80211_hw hw,
		struct ieee80211_vif *vif);
		@@ -4449,6 +4452,19 @@ static inline struct sk_buff ieee80211_beacon_get(struct ieee80211_hw hw,
		*/
		u8 ieee80211_csa_update_counter(struct ieee80211_vif *vif);

		/**
		* ieee80211_csa_set_counter - request mac80211 to set csa counter
		* @vif: &struct ieee80211_vif pointer from the add_interface callback.
		* @counter: the new value for the counter
		*
		* The csa counter can be changed by the device, this API should be
		* used by the device driver to update csa counter in mac80211.
		*
		* It should never be used together with ieee80211_csa_update_counter(),
		* as it will cause a race condition around the counter value.
		*/
		void ieee80211_csa_set_counter(struct ieee80211_vif *vif, u8 counter);

		/**
		* ieee80211_csa_finish - notify mac80211 about channel switch
		* @vif: &struct ieee80211_vif pointer from the add_interface callback.

Admin message