Merge tag 'mac80211-next-for-davem-2019-04-26' of... (30e5a9a5) · Commits · 戴 / test

drivers/net/wireless/mac80211_hwsim.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -2810,6 +2810,12 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
		ieee80211_hw_set(hw, SIGNAL_DBM);
		ieee80211_hw_set(hw, SUPPORTS_PS);
		ieee80211_hw_set(hw, TDLS_WIDER_BW);

		/* We only have SW crypto and only implement the A-MPDU API
		* (but don't really build A-MPDUs) so can have extended key
		* support
		*/
		ieee80211_hw_set(hw, EXT_KEY_ID_NATIVE);
		if (rctbl)
		ieee80211_hw_set(hw, SUPPORTS_RC_TABLE);
		ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);
		@@ -3900,6 +3906,8 @@ static int __init init_mac80211_hwsim(void)
		param.p2p_device = support_p2p_device;
		param.use_chanctx = channels > 1;
		param.iftypes = HWSIM_IFTYPE_SUPPORT_MASK;
		if (param.p2p_device)
		param.iftypes \|= BIT(NL80211_IFTYPE_P2P_DEVICE);

		err = mac80211_hwsim_new_radio(NULL, &param);
		if (err < 0)

include/linux/ieee80211.h

+9 −5

Original line number	Diff line number	Diff line
		@@ -1557,7 +1557,7 @@ struct ieee80211_vht_operation {
		* struct ieee80211_he_cap_elem - HE capabilities element
		*
		* This structure is the "HE capabilities element" fixed fields as
		* described in P802.11ax_D3.0 section 9.4.2.237.2 and 9.4.2.237.3
		* described in P802.11ax_D4.0 section 9.4.2.242.2 and 9.4.2.242.3
		*/
		struct ieee80211_he_cap_elem {
		u8 mac_cap_info[6];
		@@ -1619,12 +1619,12 @@ struct ieee80211_he_mcs_nss_supp {
		* struct ieee80211_he_operation - HE capabilities element
		*
		* This structure is the "HE operation element" fields as
		* described in P802.11ax_D3.0 section 9.4.2.238
		* described in P802.11ax_D4.0 section 9.4.2.243
		*/
		struct ieee80211_he_operation {
		__le32 he_oper_params;
		__le16 he_mcs_nss_set;
		/* Optional 0,1,3 or 4 bytes: depends on @he_oper_params */
		/* Optional 0,1,3,4,5,7 or 8 bytes: depends on @he_oper_params */
		u8 optional[0];
		} __packed;

		@@ -1632,7 +1632,7 @@ struct ieee80211_he_operation {
		* struct ieee80211_he_mu_edca_param_ac_rec - MU AC Parameter Record field
		*
		* This structure is the "MU AC Parameter Record" fields as
		* described in P802.11ax_D2.0 section 9.4.2.240
		* described in P802.11ax_D4.0 section 9.4.2.245
		*/
		struct ieee80211_he_mu_edca_param_ac_rec {
		u8 aifsn;
		@@ -1644,7 +1644,7 @@ struct ieee80211_he_mu_edca_param_ac_rec {
		* struct ieee80211_mu_edca_param_set - MU EDCA Parameter Set element
		*
		* This structure is the "MU EDCA Parameter Set element" fields as
		* described in P802.11ax_D2.0 section 9.4.2.240
		* described in P802.11ax_D4.0 section 9.4.2.245
		*/
		struct ieee80211_mu_edca_param_set {
		u8 mu_qos_info;
		@@ -2026,6 +2026,7 @@ ieee80211_he_ppe_size(u8 ppe_thres_hdr, const u8 *phy_cap_info)
		#define IEEE80211_HE_OPERATION_VHT_OPER_INFO 0x00004000
		#define IEEE80211_HE_OPERATION_CO_HOSTED_BSS 0x00008000
		#define IEEE80211_HE_OPERATION_ER_SU_DISABLE 0x00010000
		#define IEEE80211_HE_OPERATION_6GHZ_OP_INFO 0x00020000
		#define IEEE80211_HE_OPERATION_BSS_COLOR_MASK 0x3f000000
		#define IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET 24
		#define IEEE80211_HE_OPERATION_PARTIAL_BSS_COLOR 0x40000000
		@@ -2056,6 +2057,8 @@ ieee80211_he_oper_size(const u8 *he_oper_ie)
		oper_len += 3;
		if (he_oper_params & IEEE80211_HE_OPERATION_CO_HOSTED_BSS)
		oper_len++;
		if (he_oper_params & IEEE80211_HE_OPERATION_6GHZ_OP_INFO)
		oper_len += 4;

		/* Add the first byte (extension ID) to the total length */
		oper_len++;
		@@ -2487,6 +2490,7 @@ enum ieee80211_eid_ext {
		WLAN_EID_EXT_HE_MU_EDCA = 38,
		WLAN_EID_EXT_MAX_CHANNEL_SWITCH_TIME = 52,
		WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION = 55,
		WLAN_EID_EXT_NON_INHERITANCE = 56,
		};

		/* Action category code */

include/net/cfg80211.h

+104 −0

Original line number	Diff line number	Diff line
		@@ -485,6 +485,7 @@ struct vif_params {
		* with the get_key() callback, must be in little endian,
		* length given by @seq_len.
		* @seq_len: length of @seq.
		* @mode: key install mode (RX_TX, NO_TX or SET_TX)
		*/
		struct key_params {
		const u8 *key;
		@@ -492,6 +493,7 @@ struct key_params {
		int key_len;
		int seq_len;
		u32 cipher;
		enum nl80211_key_mode mode;
		};

		/**
		@@ -973,6 +975,27 @@ enum station_parameters_apply_mask {
		STATION_PARAM_APPLY_UAPSD = BIT(0),
		STATION_PARAM_APPLY_CAPABILITY = BIT(1),
		STATION_PARAM_APPLY_PLINK_STATE = BIT(2),
		STATION_PARAM_APPLY_STA_TXPOWER = BIT(3),
		};

		/**
		* struct sta_txpwr - station txpower configuration
		*
		* Used to configure txpower for station.
		*
		* @power: tx power (in dBm) to be used for sending data traffic. If tx power
		* is not provided, the default per-interface tx power setting will be
		* overriding. Driver should be picking up the lowest tx power, either tx
		* power per-interface or per-station.
		* @type: In particular if TPC %type is NL80211_TX_POWER_LIMITED then tx power
		* will be less than or equal to specified from userspace, whereas if TPC
		* %type is NL80211_TX_POWER_AUTOMATIC then it indicates default tx power.
		* NL80211_TX_POWER_FIXED is not a valid configuration option for
		* per peer TPC.
		*/
		struct sta_txpwr {
		s16 power;
		enum nl80211_tx_power_setting type;
		};

		/**
		@@ -1047,6 +1070,7 @@ struct station_parameters {
		const struct ieee80211_he_cap_elem *he_capa;
		u8 he_capa_len;
		u16 airtime_weight;
		struct sta_txpwr txpwr;
		};

		/**
		@@ -1327,6 +1351,7 @@ struct cfg80211_tid_stats {
		* @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.
		* @airtime_link_metric: mesh airtime link metric.
		*/
		struct station_info {
		u64 filled;
		@@ -1381,6 +1406,8 @@ struct station_info {

		u32 rx_mpdu_count;
		u32 fcs_err_count;

		u32 airtime_link_metric;
		};

		#if IS_ENABLED(CONFIG_CFG80211)
		@@ -1832,11 +1859,19 @@ static inline void get_random_mask_addr(u8 buf, const u8 addr, const u8 *mask)
		* @bssid: BSSID to be matched; may be all-zero BSSID in case of SSID match
		* or no match (RSSI only)
		* @rssi_thold: don't report scan results below this threshold (in s32 dBm)
		* @per_band_rssi_thold: Minimum rssi threshold for each band to be applied
		* for filtering out scan results received. Drivers advertize this support
		* of band specific rssi based filtering through the feature capability
		* %NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD. These band
		* specific rssi thresholds take precedence over rssi_thold, if specified.
		* If not specified for any band, it will be assigned with rssi_thold of
		* corresponding matchset.
		*/
		struct cfg80211_match_set {
		struct cfg80211_ssid ssid;
		u8 bssid[ETH_ALEN];
		s32 rssi_thold;
		s32 per_band_rssi_thold[NUM_NL80211_BANDS];
		};

		/**
		@@ -3099,6 +3134,32 @@ struct cfg80211_pmsr_request {
		struct cfg80211_pmsr_request_peer peers[];
		};

		/**
		* struct cfg80211_update_owe_info - OWE Information
		*
		* This structure provides information needed for the drivers to offload OWE
		* (Opportunistic Wireless Encryption) processing to the user space.
		*
		* Commonly used across update_owe_info request and event interfaces.
		*
		* @peer: MAC address of the peer device for which the OWE processing
		* has to be done.
		* @status: status code, %WLAN_STATUS_SUCCESS for successful OWE info
		* processing, use %WLAN_STATUS_UNSPECIFIED_FAILURE if user space
		* cannot give you the real status code for failures. Used only for
		* OWE update request command interface (user space to driver).
		* @ie: IEs obtained from the peer or constructed by the user space. These are
		* the IEs of the remote peer in the event from the host driver and
		* the constructed IEs by the user space in the request interface.
		* @ie_len: Length of IEs in octets.
		*/
		struct cfg80211_update_owe_info {
		u8 peer[ETH_ALEN] __aligned(2);
		u16 status;
		const u8 *ie;
		size_t ie_len;
		};

		/**
		* struct cfg80211_ops - backend description for wireless configuration
		*
		@@ -3436,6 +3497,13 @@ struct cfg80211_pmsr_request {
		* Statistics should be cumulative, currently no way to reset is provided.
		* @start_pmsr: start peer measurement (e.g. FTM)
		* @abort_pmsr: abort peer measurement
		*
		* @update_owe_info: Provide updated OWE info to driver. Driver implementing SME
		* but offloading OWE processing to the user space will get the updated
		* DH IE through this interface.
		*
		* @probe_mesh_link: Probe direct Mesh peer's link quality by sending data frame
		* and overrule HWMP path selection algorithm.
		*/
		struct cfg80211_ops {
		int (suspend)(struct wiphy wiphy, struct cfg80211_wowlan *wow);
		@@ -3750,6 +3818,10 @@ struct cfg80211_ops {
		struct cfg80211_pmsr_request *request);
		void (abort_pmsr)(struct wiphy wiphy, struct wireless_dev *wdev,
		struct cfg80211_pmsr_request *request);
		int (update_owe_info)(struct wiphy wiphy, struct net_device *dev,
		struct cfg80211_update_owe_info *owe_info);
		int (probe_mesh_link)(struct wiphy wiphy, struct net_device *dev,
		const u8 *buf, size_t len);
		};

		/*
		@@ -5491,6 +5563,28 @@ static inline void cfg80211_gen_new_bssid(const u8 *bssid, u8 max_bssid,
		u64_to_ether_addr(new_bssid_u64, new_bssid);
		}

		/**
		* cfg80211_is_element_inherited - returns if element ID should be inherited
		* @element: element to check
		* @non_inherit_element: non inheritance element
		*/
		bool cfg80211_is_element_inherited(const struct element *element,
		const struct element *non_inherit_element);

		/**
		* cfg80211_merge_profile - merges a MBSSID profile if it is split between IEs
		* @ie: ies
		* @ielen: length of IEs
		* @mbssid_elem: current MBSSID element
		* @sub_elem: current MBSSID subelement (profile)
		* @merged_ie: location of the merged profile
		* @max_copy_len: max merged profile length
		*/
		size_t cfg80211_merge_profile(const u8 *ie, size_t ielen,
		const struct element *mbssid_elem,
		const struct element *sub_elem,
		u8 *merged_ie, size_t max_copy_len);

		/**
		* enum cfg80211_bss_frame_type - frame type that the BSS data came from
		* @CFG80211_BSS_FTYPE_UNKNOWN: driver doesn't know whether the data is
		@@ -7213,4 +7307,14 @@ void cfg80211_pmsr_complete(struct wireless_dev *wdev,
		#define wiphy_WARN(wiphy, format, args...) \
		WARN(1, "wiphy: %s\n" format, wiphy_name(wiphy), ##args);

		/**
		* cfg80211_update_owe_info_event - Notify the peer's OWE info to user space
		* @netdev: network device
		* @owe_info: peer's owe info
		* @gfp: allocation flags
		*/
		void cfg80211_update_owe_info_event(struct net_device *netdev,
		struct cfg80211_update_owe_info *owe_info,
		gfp_t gfp);

		#endif /* __NET_CFG80211_H */

include/net/fq_impl.h

+10 −8

Original line number	Diff line number	Diff line
		@@ -107,21 +107,23 @@ begin:
		return skb;
		}

		static u32 fq_flow_idx(struct fq fq, struct sk_buff skb)
		{
		u32 hash = skb_get_hash_perturb(skb, fq->perturbation);

		return reciprocal_scale(hash, fq->flows_cnt);
		}

		static struct fq_flow fq_flow_classify(struct fq fq,
		struct fq_tin *tin,
		struct fq_tin *tin, u32 idx,
		struct sk_buff *skb,
		fq_flow_get_default_t get_default_func)
		{
		struct fq_flow *flow;
		u32 hash;
		u32 idx;

		lockdep_assert_held(&fq->lock);

		hash = skb_get_hash_perturb(skb, fq->perturbation);
		idx = reciprocal_scale(hash, fq->flows_cnt);
		flow = &fq->flows[idx];

		if (flow->tin && flow->tin != tin) {
		flow = get_default_func(fq, tin, idx, skb);
		tin->collisions++;
		@@ -153,7 +155,7 @@ static void fq_recalc_backlog(struct fq *fq,
		}

		static void fq_tin_enqueue(struct fq *fq,
		struct fq_tin *tin,
		struct fq_tin *tin, u32 idx,
		struct sk_buff *skb,
		fq_skb_free_t free_func,
		fq_flow_get_default_t get_default_func)
		@@ -163,7 +165,7 @@ static void fq_tin_enqueue(struct fq *fq,

		lockdep_assert_held(&fq->lock);

		flow = fq_flow_classify(fq, tin, skb, get_default_func);
		flow = fq_flow_classify(fq, tin, idx, skb, get_default_func);

		flow->tin = tin;
		flow->backlog += skb->len;

include/net/mac80211.h

+30 −0

Original line number	Diff line number	Diff line
		@@ -807,6 +807,7 @@ enum mac80211_tx_info_flags {
		* @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information
		* @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame
		* @IEEE80211_TX_CTRL_FAST_XMIT: This frame is going through the fast_xmit path
		* @IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP: This frame skips mesh path lookup
		*
		* These flags are used in tx_info->control.flags.
		*/
		@@ -816,6 +817,7 @@ enum mac80211_tx_control_flags {
		IEEE80211_TX_CTRL_RATE_INJECT = BIT(2),
		IEEE80211_TX_CTRL_AMSDU = BIT(3),
		IEEE80211_TX_CTRL_FAST_XMIT = BIT(4),
		IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP = BIT(5),
		};

		/*
		@@ -1697,6 +1699,7 @@ struct wireless_dev ieee80211_vif_to_wdev(struct ieee80211_vif vif);
		* @IEEE80211_KEY_FLAG_PUT_MIC_SPACE: This flag should be set by the driver for
		* a TKIP key if it only requires MIC space. Do not set together with
		* @IEEE80211_KEY_FLAG_GENERATE_MMIC on the same key.
		* @IEEE80211_KEY_FLAG_NO_AUTO_TX: Key needs explicit Tx activation.
		*/
		enum ieee80211_key_flags {
		IEEE80211_KEY_FLAG_GENERATE_IV_MGMT = BIT(0),
		@@ -1708,6 +1711,7 @@ enum ieee80211_key_flags {
		IEEE80211_KEY_FLAG_RX_MGMT = BIT(6),
		IEEE80211_KEY_FLAG_RESERVE_TAILROOM = BIT(7),
		IEEE80211_KEY_FLAG_PUT_MIC_SPACE = BIT(8),
		IEEE80211_KEY_FLAG_NO_AUTO_TX = BIT(9),
		};

		/**
		@@ -1887,6 +1891,24 @@ struct ieee80211_sta_rates {
		} rate[IEEE80211_TX_RATE_TABLE_SIZE];
		};

		/**
		* struct ieee80211_sta_txpwr - station txpower configuration
		*
		* Used to configure txpower for station.
		*
		* @power: indicates the tx power, in dBm, to be used when sending data frames
		* to the STA.
		* @type: In particular if TPC %type is NL80211_TX_POWER_LIMITED then tx power
		* will be less than or equal to specified from userspace, whereas if TPC
		* %type is NL80211_TX_POWER_AUTOMATIC then it indicates default tx power.
		* NL80211_TX_POWER_FIXED is not a valid configuration option for
		* per peer TPC.
		*/
		struct ieee80211_sta_txpwr {
		s16 power;
		enum nl80211_tx_power_setting type;
		};

		/**
		* struct ieee80211_sta - station table entry
		*
		@@ -1973,6 +1995,7 @@ struct ieee80211_sta {
		bool support_p2p_ps;
		u16 max_rc_amsdu_len;
		u16 max_tid_amsdu_len[IEEE80211_NUM_TIDS];
		struct ieee80211_sta_txpwr txpwr;

		struct ieee80211_txq *txq[IEEE80211_NUM_TIDS + 1];

		@@ -2243,6 +2266,9 @@ struct ieee80211_txq {
		* @IEEE80211_HW_SUPPORTS_ONLY_HE_MULTI_BSSID: Hardware supports multi BSSID
		* only for HE APs. Applies if @IEEE80211_HW_SUPPORTS_MULTI_BSSID is set.
		*
		* @IEEE80211_HW_EXT_KEY_ID_NATIVE: Driver and hardware are supporting Extended
		* Key ID and can handle two unicast keys per station for Rx and Tx.
		*
		* @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
		*/
		enum ieee80211_hw_flags {
		@@ -2294,6 +2320,7 @@ enum ieee80211_hw_flags {
		IEEE80211_HW_TX_STATUS_NO_AMPDU_LEN,
		IEEE80211_HW_SUPPORTS_MULTI_BSSID,
		IEEE80211_HW_SUPPORTS_ONLY_HE_MULTI_BSSID,
		IEEE80211_HW_EXT_KEY_ID_NATIVE,

		/* keep last, obviously */
		NUM_IEEE80211_HW_FLAGS
		@@ -3794,6 +3821,9 @@ struct ieee80211_ops {
		#endif
		void (sta_notify)(struct ieee80211_hw hw, struct ieee80211_vif *vif,
		enum sta_notify_cmd, struct ieee80211_sta *sta);
		int (sta_set_txpwr)(struct ieee80211_hw hw,
		struct ieee80211_vif *vif,
		struct ieee80211_sta *sta);
		int (sta_state)(struct ieee80211_hw hw, struct ieee80211_vif *vif,
		struct ieee80211_sta *sta,
		enum ieee80211_sta_state old_state,

Admin message