Merge tag 'mac80211-for-net-2020-04-15' of... (6058ee09) · Commits · 戴 / test

drivers/net/wireless/mac80211_hwsim.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -3669,9 +3669,9 @@ static int hwsim_new_radio_nl(struct sk_buff msg, struct genl_info info)
		}

		if (info->attrs[HWSIM_ATTR_RADIO_NAME]) {
		hwname = kasprintf(GFP_KERNEL, "%.*s",
		hwname = kstrndup((char *)nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME]),
		nla_len(info->attrs[HWSIM_ATTR_RADIO_NAME]),
		(char *)nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME]));
		GFP_KERNEL);
		if (!hwname)
		return -ENOMEM;
		param.hwname = hwname;
		@@ -3691,9 +3691,9 @@ static int hwsim_del_radio_nl(struct sk_buff msg, struct genl_info info)
		if (info->attrs[HWSIM_ATTR_RADIO_ID]) {
		idx = nla_get_u32(info->attrs[HWSIM_ATTR_RADIO_ID]);
		} else if (info->attrs[HWSIM_ATTR_RADIO_NAME]) {
		hwname = kasprintf(GFP_KERNEL, "%.*s",
		hwname = kstrndup((char *)nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME]),
		nla_len(info->attrs[HWSIM_ATTR_RADIO_NAME]),
		(char *)nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME]));
		GFP_KERNEL);
		if (!hwname)
		return -ENOMEM;
		} else

include/net/cfg80211.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -905,6 +905,8 @@ struct survey_info {
		* protocol frames.
		* @control_port_over_nl80211: TRUE if userspace expects to exchange control
		* port frames over NL80211 instead of the network interface.
		* @control_port_no_preauth: disables pre-auth rx over the nl80211 control
		* port for mac80211
		* @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
		@@ -1222,6 +1224,7 @@ struct sta_txpwr {
		* @he_capa: HE capabilities of station
		* @he_capa_len: the length of the HE capabilities
		* @airtime_weight: airtime scheduler weight for this station
		* @txpwr: transmit power for an associated station
		*/
		struct station_parameters {
		const u8 *supported_rates;
		@@ -4666,6 +4669,9 @@ struct wiphy_iftype_akm_suites {
		* @txq_memory_limit: configuration internal TX queue memory limit
		* @txq_quantum: configuration of internal TX queue scheduler quantum
		*
		* @tx_queue_len: allow setting transmit queue len for drivers not using
		* wake_tx_queue
		*
		* @support_mbssid: can HW support association with nontransmitted AP
		* @support_only_he_mbssid: don't parse MBSSID elements if it is not
		* HE AP, in order to avoid compatibility issues.
		@@ -4681,6 +4687,10 @@ struct wiphy_iftype_akm_suites {
		* supported by the driver for each peer
		* @tid_config_support.max_retry: maximum supported retry count for
		* long/short retry configuration
		*
		* @max_data_retry_count: maximum supported per TID retry count for
		* configuration through the %NL80211_TID_CONFIG_ATTR_RETRY_SHORT and
		* %NL80211_TID_CONFIG_ATTR_RETRY_LONG attributes
		*/
		struct wiphy {
		/* assign these fields before you register the wiphy */

net/mac80211/main.c

+13 −11

Original line number	Diff line number	Diff line
		@@ -1069,7 +1069,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
		local->hw.wiphy->signal_type = CFG80211_SIGNAL_TYPE_UNSPEC;
		if (hw->max_signal <= 0) {
		result = -EINVAL;
		goto fail_wiphy_register;
		goto fail_workqueue;
		}
		}

		@@ -1135,7 +1135,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)

		result = ieee80211_init_cipher_suites(local);
		if (result < 0)
		goto fail_wiphy_register;
		goto fail_workqueue;

		if (!local->ops->remain_on_channel)
		local->hw.wiphy->max_remain_on_channel_duration = 5000;
		@@ -1161,10 +1161,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)

		local->hw.wiphy->max_num_csa_counters = IEEE80211_MAX_CSA_COUNTERS_NUM;

		result = wiphy_register(local->hw.wiphy);
		if (result < 0)
		goto fail_wiphy_register;

		/*
		* We use the number of queues for feature tests (QoS, HT) internally
		* so restrict them appropriately.
		@@ -1217,9 +1213,9 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
		goto fail_flows;

		rtnl_lock();

		result = ieee80211_init_rate_ctrl_alg(local,
		hw->rate_control_algorithm);
		rtnl_unlock();
		if (result < 0) {
		wiphy_debug(local->hw.wiphy,
		"Failed to initialize rate control algorithm\n");
		@@ -1273,6 +1269,12 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
		local->sband_allocated \|= BIT(band);
		}

		result = wiphy_register(local->hw.wiphy);
		if (result < 0)
		goto fail_wiphy_register;

		rtnl_lock();

		/* add one default STA interface if supported */
		if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION) &&
		!ieee80211_hw_check(hw, NO_AUTO_VIF)) {
		@@ -1312,17 +1314,17 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
		#if defined(CONFIG_INET) \|\| defined(CONFIG_IPV6)
		fail_ifa:
		#endif
		wiphy_unregister(local->hw.wiphy);
		fail_wiphy_register:
		rtnl_lock();
		rate_control_deinitialize(local);
		ieee80211_remove_interfaces(local);
		fail_rate:
		rtnl_unlock();
		fail_rate:
		fail_flows:
		ieee80211_led_exit(local);
		destroy_workqueue(local->workqueue);
		fail_workqueue:
		wiphy_unregister(local->hw.wiphy);
		fail_wiphy_register:
		if (local->wiphy_ciphers_allocated)
		kfree(local->hw.wiphy->cipher_suites);
		kfree(local->int_scan_req);
		@@ -1372,8 +1374,8 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
		skb_queue_purge(&local->skb_queue_unreliable);
		skb_queue_purge(&local->skb_queue_tdls_chsw);

		destroy_workqueue(local->workqueue);
		wiphy_unregister(local->hw.wiphy);
		destroy_workqueue(local->workqueue);
		ieee80211_led_exit(local);
		kfree(local->int_scan_req);
		}

net/mac80211/mesh.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -1257,15 +1257,15 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
		sdata->u.mesh.mshcfg.rssi_threshold < rx_status->signal)
		mesh_neighbour_update(sdata, mgmt->sa, &elems,
		rx_status);

		if (ifmsh->csa_role != IEEE80211_MESH_CSA_ROLE_INIT &&
		!sdata->vif.csa_active)
		ieee80211_mesh_process_chnswitch(sdata, &elems, true);
		}

		if (ifmsh->sync_ops)
		ifmsh->sync_ops->rx_bcn_presp(sdata,
		stype, mgmt, &elems, rx_status);

		if (ifmsh->csa_role != IEEE80211_MESH_CSA_ROLE_INIT &&
		!sdata->vif.csa_active)
		ieee80211_mesh_process_chnswitch(sdata, &elems, true);
		}

		int ieee80211_mesh_finish_csa(struct ieee80211_sub_if_data *sdata)
		@@ -1373,6 +1373,9 @@ static void mesh_rx_csa_frame(struct ieee80211_sub_if_data *sdata,
		ieee802_11_parse_elems(pos, len - baselen, true, &elems,
		mgmt->bssid, NULL);

		if (!mesh_matches_local(sdata, &elems))
		return;

		ifmsh->chsw_ttl = elems.mesh_chansw_params_ie->mesh_ttl;
		if (!--ifmsh->chsw_ttl)
		fwd_csa = false;

net/wireless/nl80211.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -644,10 +644,8 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
		[NL80211_ATTR_HE_CAPABILITY] = { .type = NLA_BINARY,
		.len = NL80211_HE_MAX_CAPABILITY_LEN },

		[NL80211_ATTR_FTM_RESPONDER] = {
		.type = NLA_NESTED,
		.validation_data = nl80211_ftm_responder_policy,
		},
		[NL80211_ATTR_FTM_RESPONDER] =
		NLA_POLICY_NESTED(nl80211_ftm_responder_policy),
		[NL80211_ATTR_TIMEOUT] = NLA_POLICY_MIN(NLA_U32, 1),
		[NL80211_ATTR_PEER_MEASUREMENTS] =
		NLA_POLICY_NESTED(nl80211_pmsr_attr_policy),

Admin message