Merge tag 'mac80211-next-for-davem-2018-10-12' of... (e32cf9a3) · Commits · 戴 / test

drivers/net/wireless/mac80211_hwsim.c

+1 −10

Original line number	Diff line number	Diff line
		@@ -495,7 +495,6 @@ static const struct ieee80211_iface_combination hwsim_if_comb_p2p_dev[] = {

		static spinlock_t hwsim_radio_lock;
		static LIST_HEAD(hwsim_radios);
		static struct workqueue_struct *hwsim_wq;
		static struct rhashtable hwsim_radios_rht;
		static int hwsim_radio_idx;
		static int hwsim_radios_generation = 1;
		@@ -3692,13 +3691,9 @@ static int __init init_mac80211_hwsim(void)

		spin_lock_init(&hwsim_radio_lock);

		hwsim_wq = alloc_workqueue("hwsim_wq", 0, 0);
		if (!hwsim_wq)
		return -ENOMEM;

		err = rhashtable_init(&hwsim_radios_rht, &hwsim_rht_params);
		if (err)
		goto out_free_wq;
		return err;

		err = register_pernet_device(&hwsim_net_ops);
		if (err)
		@@ -3829,8 +3824,6 @@ out_unregister_pernet:
		unregister_pernet_device(&hwsim_net_ops);
		out_free_rht:
		rhashtable_destroy(&hwsim_radios_rht);
		out_free_wq:
		destroy_workqueue(hwsim_wq);
		return err;
		}
		module_init(init_mac80211_hwsim);
		@@ -3842,12 +3835,10 @@ static void __exit exit_mac80211_hwsim(void)
		hwsim_exit_netlink();

		mac80211_hwsim_free();
		flush_workqueue(hwsim_wq);

		rhashtable_destroy(&hwsim_radios_rht);
		unregister_netdev(hwsim_mon);
		platform_driver_unregister(&mac80211_hwsim_driver);
		unregister_pernet_device(&hwsim_net_ops);
		destroy_workqueue(hwsim_wq);
		}
		module_exit(exit_mac80211_hwsim);

include/linux/ieee80211.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -1670,6 +1670,7 @@ struct ieee80211_mu_edca_param_set {
		#define IEEE80211_VHT_CAP_RXSTBC_3 0x00000300
		#define IEEE80211_VHT_CAP_RXSTBC_4 0x00000400
		#define IEEE80211_VHT_CAP_RXSTBC_MASK 0x00000700
		#define IEEE80211_VHT_CAP_RXSTBC_SHIFT 8
		#define IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE 0x00000800
		#define IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE 0x00001000
		#define IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT 13

include/net/cfg80211.h

+59 −3

Original line number	Diff line number	Diff line
		@@ -775,6 +775,12 @@ struct cfg80211_crypto_settings {
		* @assocresp_ies_len: length of assocresp_ies in octets
		* @probe_resp_len: length of probe response template (@probe_resp)
		* @probe_resp: probe response template (AP mode only)
		* @ftm_responder: enable FTM responder functionality; -1 for no change
		* (which also implies no change in LCI/civic location data)
		* @lci: LCI subelement content
		* @civicloc: Civic location subelement content
		* @lci_len: LCI data length
		* @civicloc_len: Civic location data length
		*/
		struct cfg80211_beacon_data {
		const u8 head, tail;
		@@ -782,12 +788,17 @@ struct cfg80211_beacon_data {
		const u8 *proberesp_ies;
		const u8 *assocresp_ies;
		const u8 *probe_resp;
		const u8 *lci;
		const u8 *civicloc;
		s8 ftm_responder;

		size_t head_len, tail_len;
		size_t beacon_ies_len;
		size_t proberesp_ies_len;
		size_t assocresp_ies_len;
		size_t probe_resp_len;
		size_t lci_len;
		size_t civicloc_len;
		};

		struct mac_address {
		@@ -1292,6 +1303,10 @@ struct cfg80211_tid_stats {
		* @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.
		* @rx_mpdu_count: number of MPDUs received from this station
		* @fcs_err_count: number of packets (MPDUs) received from this station with
		* an FCS error. This counter should be incremented only when TA of the
		* received packet with an FCS error matches the peer MAC address.
		*/
		struct station_info {
		u64 filled;
		@@ -1338,6 +1353,9 @@ struct station_info {
		struct cfg80211_tid_stats *pertid;
		s8 ack_signal;
		s8 avg_ack_signal;

		u32 rx_mpdu_count;
		u32 fcs_err_count;
		};

		#if IS_ENABLED(CONFIG_CFG80211)
		@@ -2796,6 +2814,40 @@ struct cfg80211_external_auth_params {
		u16 status;
		};

		/**
		* cfg80211_ftm_responder_stats - FTM responder statistics
		*
		* @filled: bitflag of flags using the bits of &enum nl80211_ftm_stats to
		* indicate the relevant values in this struct for them
		* @success_num: number of FTM sessions in which all frames were successfully
		* answered
		* @partial_num: number of FTM sessions in which part of frames were
		* successfully answered
		* @failed_num: number of failed FTM sessions
		* @asap_num: number of ASAP FTM sessions
		* @non_asap_num: number of non-ASAP FTM sessions
		* @total_duration_ms: total sessions durations - gives an indication
		* of how much time the responder was busy
		* @unknown_triggers_num: number of unknown FTM triggers - triggers from
		* initiators that didn't finish successfully the negotiation phase with
		* the responder
		* @reschedule_requests_num: number of FTM reschedule requests - initiator asks
		* for a new scheduling although it already has scheduled FTM slot
		* @out_of_window_triggers_num: total FTM triggers out of scheduled window
		*/
		struct cfg80211_ftm_responder_stats {
		u32 filled;
		u32 success_num;
		u32 partial_num;
		u32 failed_num;
		u32 asap_num;
		u32 non_asap_num;
		u64 total_duration_ms;
		u32 unknown_triggers_num;
		u32 reschedule_requests_num;
		u32 out_of_window_triggers_num;
		};

		/**
		* struct cfg80211_ops - backend description for wireless configuration
		*
		@@ -3128,6 +3180,9 @@ struct cfg80211_external_auth_params {
		*
		* @tx_control_port: TX a control port frame (EAPoL). The noencrypt parameter
		* tells the driver that the frame should not be encrypted.
		*
		* @get_ftm_responder_stats: Retrieve FTM responder statistics, if available.
		* Statistics should be cumulative, currently no way to reset is provided.
		*/
		struct cfg80211_ops {
		int (suspend)(struct wiphy wiphy, struct cfg80211_wowlan *wow);
		@@ -3433,6 +3488,10 @@ struct cfg80211_ops {
		const u8 *buf, size_t len,
		const u8 *dest, const __be16 proto,
		const bool noencrypt);

		int (get_ftm_responder_stats)(struct wiphy wiphy,
		struct net_device *dev,
		struct cfg80211_ftm_responder_stats *ftm_stats);
		};

		/*
		@@ -3960,7 +4019,6 @@ struct wiphy_iftype_ext_capab {
		* by the driver in the .connect() callback. The bit position maps to the
		* attribute indices defined in &enum nl80211_bss_select_attr.
		*
		* @cookie_counter: unique generic cookie counter, used to identify objects.
		* @nan_supported_bands: bands supported by the device in NAN mode, a
		* bitmap of &enum nl80211_band values. For instance, for
		* NL80211_BAND_2GHZ, bit 0 would be set
		@@ -4099,8 +4157,6 @@ struct wiphy {

		u32 bss_select_support;

		u64 cookie_counter;

		u8 nan_supported_bands;

		u32 txq_limit;

include/net/mac80211.h

+43 −0

Original line number	Diff line number	Diff line
		@@ -309,6 +309,8 @@ struct ieee80211_vif_chanctx_switch {
		* @BSS_CHANGED_KEEP_ALIVE: keep alive options (idle period or protected
		* keep alive) changed.
		* @BSS_CHANGED_MCAST_RATE: Multicast Rate setting changed for this interface
		* @BSS_CHANGED_FTM_RESPONDER: fime timing reasurement request responder
		* functionality changed for this BSS (AP mode).
		*
		*/
		enum ieee80211_bss_change {
		@@ -338,6 +340,7 @@ enum ieee80211_bss_change {
		BSS_CHANGED_MU_GROUPS = 1<<23,
		BSS_CHANGED_KEEP_ALIVE = 1<<24,
		BSS_CHANGED_MCAST_RATE = 1<<25,
		BSS_CHANGED_FTM_RESPONDER = 1<<26,

		/* when adding here, make sure to change ieee80211_reconfig */
		};
		@@ -463,6 +466,21 @@ struct ieee80211_mu_group_data {
		u8 position[WLAN_USER_POSITION_LEN];
		};

		/**
		* ieee80211_ftm_responder_params - FTM responder parameters
		*
		* @lci: LCI subelement content
		* @civicloc: CIVIC location subelement content
		* @lci_len: LCI data length
		* @civicloc_len: Civic data length
		*/
		struct ieee80211_ftm_responder_params {
		const u8 *lci;
		const u8 *civicloc;
		size_t lci_len;
		size_t civicloc_len;
		};

		/**
		* struct ieee80211_bss_conf - holds the BSS's changing parameters
		*
		@@ -562,6 +580,9 @@ struct ieee80211_mu_group_data {
		* @protected_keep_alive: if set, indicates that the station should send an RSN
		* protected frame to the AP to reset the idle timer at the AP for the
		* station.
		* @ftm_responder: whether to enable or disable fine timing measurement FTM
		* responder functionality.
		* @ftmr_params: configurable lci/civic parameter when enabling FTM responder.
		*/
		struct ieee80211_bss_conf {
		const u8 *bssid;
		@@ -612,6 +633,8 @@ struct ieee80211_bss_conf {
		bool allow_p2p_go_ps;
		u16 max_idle_period;
		bool protected_keep_alive;
		bool ftm_responder;
		struct ieee80211_ftm_responder_params *ftmr_params;
		};

		/**
		@@ -3598,6 +3621,8 @@ enum ieee80211_reconfig_type {
		* aggregating two specific frames in the same A-MSDU. The relation
		* between the skbs should be symmetric and transitive. Note that while
		* skb is always a real frame, head may or may not be an A-MSDU.
		* @get_ftm_responder_stats: Retrieve FTM responder statistics, if available.
		* Statistics should be cumulative, currently no way to reset is provided.
		*/
		struct ieee80211_ops {
		void (tx)(struct ieee80211_hw hw,
		@@ -3883,6 +3908,9 @@ struct ieee80211_ops {
		bool (can_aggregate_in_amsdu)(struct ieee80211_hw hw,
		struct sk_buff *head,
		struct sk_buff *skb);
		int (get_ftm_responder_stats)(struct ieee80211_hw hw,
		struct ieee80211_vif *vif,
		struct cfg80211_ftm_responder_stats *ftm_stats);
		};

		/**
		@@ -4351,6 +4379,21 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif,
		void ieee80211_sta_set_expected_throughput(struct ieee80211_sta *pubsta,
		u32 thr);

		/**
		* ieee80211_tx_rate_update - transmit rate update callback
		*
		* Drivers should call this functions with a non-NULL pub sta
		* This function can be used in drivers that does not have provision
		* in updating the tx rate in data path.
		*
		* @hw: the hardware the frame was transmitted by
		* @pubsta: the station to update the tx rate for.
		* @info: tx status information
		*/
		void ieee80211_tx_rate_update(struct ieee80211_hw *hw,
		struct ieee80211_sta *pubsta,
		struct ieee80211_tx_info *info);

		/**
		* ieee80211_tx_status - transmit status callback
		*

include/uapi/linux/nl80211.h

+98 −0

Original line number	Diff line number	Diff line
		@@ -1033,6 +1033,9 @@
		* %NL80211_ATTR_CHANNEL_WIDTH,%NL80211_ATTR_NSS attributes with its
		* address(specified in %NL80211_ATTR_MAC).
		*
		* @NL80211_CMD_GET_FTM_RESPONDER_STATS: Retrieve FTM responder statistics, in
		* the %NL80211_ATTR_FTM_RESPONDER_STATS attribute.
		*
		* @NL80211_CMD_MAX: highest used command number
		* @__NL80211_CMD_AFTER_LAST: internal use
		*/
		@@ -1245,6 +1248,8 @@ enum nl80211_commands {

		NL80211_CMD_CONTROL_PORT_FRAME,

		NL80211_CMD_GET_FTM_RESPONDER_STATS,

		/* add new commands above here */

		/* used to define NL80211_CMD_MAX below */
		@@ -2241,6 +2246,14 @@ enum nl80211_commands {
		* association request when used with NL80211_CMD_NEW_STATION). Can be set
		* only if %NL80211_STA_FLAG_WME is set.
		*
		* @NL80211_ATTR_FTM_RESPONDER: nested attribute which user-space can include
		* in %NL80211_CMD_START_AP or %NL80211_CMD_SET_BEACON for fine timing
		* measurement (FTM) responder functionality and containing parameters as
		* possible, see &enum nl80211_ftm_responder_attr
		*
		* @NL80211_ATTR_FTM_RESPONDER_STATS: Nested attribute with FTM responder
		* statistics, see &enum nl80211_ftm_responder_stats.
		*
		* @NUM_NL80211_ATTR: total number of nl80211_attrs available
		* @NL80211_ATTR_MAX: highest attribute number currently defined
		* @__NL80211_ATTR_AFTER_LAST: internal use
		@@ -2682,6 +2695,10 @@ enum nl80211_attrs {

		NL80211_ATTR_HE_CAPABILITY,

		NL80211_ATTR_FTM_RESPONDER,

		NL80211_ATTR_FTM_RESPONDER_STATS,

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

		__NL80211_ATTR_AFTER_LAST,
		@@ -3051,6 +3068,12 @@ enum nl80211_sta_bss_param {
		* @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment
		* @NL80211_STA_INFO_ACK_SIGNAL: signal strength of the last ACK frame(u8, dBm)
		* @NL80211_STA_INFO_ACK_SIGNAL_AVG: avg signal strength of ACK frames (s8, dBm)
		* @NL80211_STA_INFO_RX_MPDUS: total number of received packets (MPDUs)
		* (u32, from this station)
		* @NL80211_STA_INFO_FCS_ERROR_COUNT: total number of packets (MPDUs) received
		* with an FCS error (u32, from this station). This count may not include
		* some packets with an FCS error due to TA corruption. Hence this counter
		* might not be fully accurate.
		* @__NL80211_STA_INFO_AFTER_LAST: internal
		* @NL80211_STA_INFO_MAX: highest possible station info attribute
		*/
		@@ -3091,6 +3114,8 @@ enum nl80211_sta_info {
		NL80211_STA_INFO_PAD,
		NL80211_STA_INFO_ACK_SIGNAL,
		NL80211_STA_INFO_ACK_SIGNAL_AVG,
		NL80211_STA_INFO_RX_MPDUS,
		NL80211_STA_INFO_FCS_ERROR_COUNT,

		/* keep last */
		__NL80211_STA_INFO_AFTER_LAST,
		@@ -5225,6 +5250,8 @@ enum nl80211_feature_flags {
		* @NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT: Driver/device can omit all data
		* except for supported rates from the probe request content if requested
		* by the %NL80211_SCAN_FLAG_MIN_PREQ_CONTENT flag.
		* @NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER: Driver supports enabling fine
		* timing measurement responder role.
		*
		* @NL80211_EXT_FEATURE_CAN_REPLACE_PTK0: Driver/device confirm that they are
		* able to rekey an in-use key correctly. Userspace must not rekey PTK keys
		@@ -5269,6 +5296,7 @@ enum nl80211_ext_feature_index {
		NL80211_EXT_FEATURE_SCAN_RANDOM_SN,
		NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT,
		NL80211_EXT_FEATURE_CAN_REPLACE_PTK0,
		NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER,

		/* add new features before the definition below */
		NUM_NL80211_EXT_FEATURES,
		@@ -5808,4 +5836,74 @@ enum nl80211_external_auth_action {
		NL80211_EXTERNAL_AUTH_ABORT,
		};

		/**
		* enum nl80211_ftm_responder_attributes - fine timing measurement
		* responder attributes
		* @__NL80211_FTM_RESP_ATTR_INVALID: Invalid
		* @NL80211_FTM_RESP_ATTR_ENABLED: FTM responder is enabled
		* @NL80211_FTM_RESP_ATTR_LCI: The content of Measurement Report Element
		* (9.4.2.22 in 802.11-2016) with type 8 - LCI (9.4.2.22.10)
		* @NL80211_FTM_RESP_ATTR_CIVIC: The content of Measurement Report Element
		* (9.4.2.22 in 802.11-2016) with type 11 - Civic (Section 9.4.2.22.13)
		* @__NL80211_FTM_RESP_ATTR_LAST: Internal
		* @NL80211_FTM_RESP_ATTR_MAX: highest FTM responder attribute.
		*/
		enum nl80211_ftm_responder_attributes {
		__NL80211_FTM_RESP_ATTR_INVALID,

		NL80211_FTM_RESP_ATTR_ENABLED,
		NL80211_FTM_RESP_ATTR_LCI,
		NL80211_FTM_RESP_ATTR_CIVICLOC,

		/* keep last */
		__NL80211_FTM_RESP_ATTR_LAST,
		NL80211_FTM_RESP_ATTR_MAX = __NL80211_FTM_RESP_ATTR_LAST - 1,
		};

		/*
		* enum nl80211_ftm_responder_stats - FTM responder statistics
		*
		* These attribute types are used with %NL80211_ATTR_FTM_RESPONDER_STATS
		* when getting FTM responder statistics.
		*
		* @__NL80211_FTM_STATS_INVALID: attribute number 0 is reserved
		* @NL80211_FTM_STATS_SUCCESS_NUM: number of FTM sessions in which all frames
		* were ssfully answered (u32)
		* @NL80211_FTM_STATS_PARTIAL_NUM: number of FTM sessions in which part of the
		* frames were successfully answered (u32)
		* @NL80211_FTM_STATS_FAILED_NUM: number of failed FTM sessions (u32)
		* @NL80211_FTM_STATS_ASAP_NUM: number of ASAP sessions (u32)
		* @NL80211_FTM_STATS_NON_ASAP_NUM: number of non-ASAP sessions (u32)
		* @NL80211_FTM_STATS_TOTAL_DURATION_MSEC: total sessions durations - gives an
		* indication of how much time the responder was busy (u64, msec)
		* @NL80211_FTM_STATS_UNKNOWN_TRIGGERS_NUM: number of unknown FTM triggers -
		* triggers from initiators that didn't finish successfully the negotiation
		* phase with the responder (u32)
		* @NL80211_FTM_STATS_RESCHEDULE_REQUESTS_NUM: number of FTM reschedule requests
		* - initiator asks for a new scheduling although it already has scheduled
		* FTM slot (u32)
		* @NL80211_FTM_STATS_OUT_OF_WINDOW_TRIGGERS_NUM: number of FTM triggers out of
		* scheduled window (u32)
		* @NL80211_FTM_STATS_PAD: used for padding, ignore
		* @__NL80211_TXQ_ATTR_AFTER_LAST: Internal
		* @NL80211_FTM_STATS_MAX: highest possible FTM responder stats attribute
		*/
		enum nl80211_ftm_responder_stats {
		__NL80211_FTM_STATS_INVALID,
		NL80211_FTM_STATS_SUCCESS_NUM,
		NL80211_FTM_STATS_PARTIAL_NUM,
		NL80211_FTM_STATS_FAILED_NUM,
		NL80211_FTM_STATS_ASAP_NUM,
		NL80211_FTM_STATS_NON_ASAP_NUM,
		NL80211_FTM_STATS_TOTAL_DURATION_MSEC,
		NL80211_FTM_STATS_UNKNOWN_TRIGGERS_NUM,
		NL80211_FTM_STATS_RESCHEDULE_REQUESTS_NUM,
		NL80211_FTM_STATS_OUT_OF_WINDOW_TRIGGERS_NUM,
		NL80211_FTM_STATS_PAD,

		/* keep last */
		__NL80211_FTM_STATS_AFTER_LAST,
		NL80211_FTM_STATS_MAX = __NL80211_FTM_STATS_AFTER_LAST - 1
		};

		#endif /* __LINUX_NL80211_H */

Admin message