Merge tag 'mac80211-next-for-davem-2020-07-31' of... (6f3de75c) · Commits · 戴 / test

drivers/net/wireless/ath/ath10k/mac.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -568,11 +568,7 @@ chan_to_phymode(const struct cfg80211_chan_def *chandef)
		case NL80211_CHAN_WIDTH_40:
		phymode = MODE_11NG_HT40;
		break;
		case NL80211_CHAN_WIDTH_5:
		case NL80211_CHAN_WIDTH_10:
		case NL80211_CHAN_WIDTH_80:
		case NL80211_CHAN_WIDTH_80P80:
		case NL80211_CHAN_WIDTH_160:
		default:
		phymode = MODE_UNKNOWN;
		break;
		}
		@@ -597,8 +593,7 @@ chan_to_phymode(const struct cfg80211_chan_def *chandef)
		case NL80211_CHAN_WIDTH_80P80:
		phymode = MODE_11AC_VHT80_80;
		break;
		case NL80211_CHAN_WIDTH_5:
		case NL80211_CHAN_WIDTH_10:
		default:
		phymode = MODE_UNKNOWN;
		break;
		}

drivers/net/wireless/ath/ath11k/mac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2072,7 +2072,7 @@ static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
		ret = ath11k_wmi_send_obss_color_collision_cfg_cmd(
		ar, arvif->vdev_id, info->he_bss_color.color,
		ATH11K_BSS_COLOR_COLLISION_DETECTION_AP_PERIOD_MS,
		!info->he_bss_color.disabled);
		info->he_bss_color.enabled);
		if (ret)
		ath11k_warn(ar->ab, "failed to set bss color collision on vdev %i: %d\n",
		arvif->vdev_id, ret);

drivers/net/wireless/mac80211_hwsim.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4334,7 +4334,7 @@ static int __init init_mac80211_hwsim(void)
		break;
		case HWSIM_REGTEST_STRICT_ALL:
		param.reg_strict = true;
		/* fall through */
		fallthrough;
		case HWSIM_REGTEST_DRIVER_REG_ALL:
		param.reg_alpha2 = hwsim_alpha2s[0];
		break;

include/net/cfg80211.h

+37 −4

Original line number	Diff line number	Diff line
		@@ -267,12 +267,12 @@ struct ieee80211_he_obss_pd {
		* struct cfg80211_he_bss_color - AP settings for BSS coloring
		*
		* @color: the current color.
		* @disabled: is the feature disabled.
		* @enabled: HE BSS color is used
		* @partial: define the AID equation.
		*/
		struct cfg80211_he_bss_color {
		u8 color;
		bool disabled;
		bool enabled;
		bool partial;
		};

		@@ -417,13 +417,29 @@ struct ieee80211_edmg {
		enum ieee80211_edmg_bw_config bw_config;
		};

		/**
		* struct ieee80211_sta_s1g_cap - STA's S1G capabilities
		*
		* This structure describes most essential parameters needed
		* to describe 802.11ah S1G capabilities for a STA.
		*
		* @s1g_supported: is STA an S1G STA
		* @cap: S1G capabilities information
		* @nss_mcs: Supported NSS MCS set
		*/
		struct ieee80211_sta_s1g_cap {
		bool s1g;
		u8 cap[10]; /* use S1G_CAPAB_ */
		u8 nss_mcs[5];
		};

		/**
		* struct ieee80211_supported_band - frequency band definition
		*
		* This structure describes a frequency band a wiphy
		* is able to operate in.
		*
		* @channels: Array of channels the hardware can operate in
		* @channels: Array of channels the hardware can operate with
		* in this band.
		* @band: the band this structure represents
		* @n_channels: Number of channels in @channels
		@@ -448,6 +464,7 @@ struct ieee80211_supported_band {
		int n_bitrates;
		struct ieee80211_sta_ht_cap ht_cap;
		struct ieee80211_sta_vht_cap vht_cap;
		struct ieee80211_sta_s1g_cap s1g_cap;
		struct ieee80211_edmg edmg_cap;
		u16 n_iftype_data;
		const struct ieee80211_sband_iftype_data *iftype_data;
		@@ -1581,6 +1598,7 @@ struct cfg80211_tid_stats {
		* 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.
		* @connected_to_as: true if mesh STA has a path to authentication server
		*/
		struct station_info {
		u64 filled;
		@@ -1638,6 +1656,8 @@ struct station_info {
		u32 fcs_err_count;

		u32 airtime_link_metric;

		u8 connected_to_as;
		};

		#if IS_ENABLED(CONFIG_CFG80211)
		@@ -1853,6 +1873,11 @@ struct bss_parameters {
		* connected to a mesh gate in mesh formation info. If false, the
		* value in mesh formation is determined by the presence of root paths
		* in the mesh path table
		* @dot11MeshNolearn: Try to avoid multi-hop path discovery (e.g. PREQ/PREP
		* for HWMP) if the destination is a direct neighbor. Note that this might
		* not be the optimal decision as a multi-hop route might be better. So
		* if using this setting you will likely also want to disable
		* dot11MeshForwarding and use another mesh routing protocol on top.
		*/
		struct mesh_config {
		u16 dot11MeshRetryTimeout;
		@@ -1873,6 +1898,7 @@ struct mesh_config {
		u16 dot11MeshHWMPnetDiameterTraversalTime;
		u8 dot11MeshHWMPRootMode;
		bool dot11MeshConnectedToMeshGate;
		bool dot11MeshConnectedToAuthServer;
		u16 dot11MeshHWMPRannInterval;
		bool dot11MeshGateAnnouncementProtocol;
		bool dot11MeshForwarding;
		@@ -1884,6 +1910,7 @@ struct mesh_config {
		enum nl80211_mesh_power_mode power_mode;
		u16 dot11MeshAwakeWindowDuration;
		u32 plink_timeout;
		bool dot11MeshNolearn;
		};

		/**
		@@ -5510,7 +5537,7 @@ static inline int ieee80211_data_to_8023(struct sk_buff skb, const u8 addr,
		*
		* @skb: The input A-MSDU frame without any headers.
		* @list: The output list of 802.3 frames. It must be allocated and
		* initialized by by the caller.
		* initialized by the caller.
		* @addr: The device MAC address.
		* @iftype: The device interface type.
		* @extra_headroom: The hardware extra headroom for SKBs in the @list.
		@@ -7882,4 +7909,10 @@ void cfg80211_update_owe_info_event(struct net_device *netdev,
		struct cfg80211_update_owe_info *owe_info,
		gfp_t gfp);

		/**
		* cfg80211_bss_flush - resets all the scan entries
		* @wiphy: the wiphy
		*/
		void cfg80211_bss_flush(struct wiphy *wiphy);

		#endif /* __NET_CFG80211_H */

include/net/fq.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ struct fq {
		struct list_head backlogs;
		spinlock_t lock;
		u32 flows_cnt;
		siphash_key_t perturbation;
		u32 limit;
		u32 memory_limit;
		u32 memory_usage;

Admin message