Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (20fb9e50) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -542,9 +542,8 @@ brcms_ops_bss_info_changed(struct ieee80211_hw *hw,

		if (changed & BSS_CHANGED_ARP_FILTER) {
		/* Hardware ARP filter address list or state changed */
		brcms_err(core, "%s: arp filtering: enabled %s, count %d"
		" (implement)\n", __func__, info->arp_filter_enabled ?
		"true" : "false", info->arp_addr_cnt);
		brcms_err(core, "%s: arp filtering: %d addresses"
		" (implement)\n", __func__, info->arp_addr_cnt);
		}

		if (changed & BSS_CHANGED_QOS) {

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1154,6 +1154,7 @@ static int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
		}

		static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
		struct ieee80211_vif *vif,
		enum ieee80211_rssi_event rssi_event)
		{
		struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);

drivers/net/wireless/ti/wlcore/main.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -4239,8 +4239,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
		wlvif->sta.qos = bss_conf->qos;
		WARN_ON(wlvif->bss_type != BSS_TYPE_STA_BSS);

		if (bss_conf->arp_addr_cnt == 1 &&
		bss_conf->arp_filter_enabled) {
		if (bss_conf->arp_addr_cnt == 1 && bss_conf->assoc) {
		wlvif->ip_addr = addr;
		/*
		* The template should have been configured only upon

include/linux/ieee80211.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -1898,6 +1898,9 @@ enum ieee80211_sa_query_action {
		/* AKM suite selectors */
		#define WLAN_AKM_SUITE_8021X 0x000FAC01
		#define WLAN_AKM_SUITE_PSK 0x000FAC02
		#define WLAN_AKM_SUITE_8021X_SHA256 0x000FAC05
		#define WLAN_AKM_SUITE_PSK_SHA256 0x000FAC06
		#define WLAN_AKM_SUITE_TDLS 0x000FAC07
		#define WLAN_AKM_SUITE_SAE 0x000FAC08
		#define WLAN_AKM_SUITE_FT_OVER_SAE 0x000FAC09

include/net/cfg80211.h

+38 −4

Original line number	Diff line number	Diff line
		@@ -527,6 +527,26 @@ struct cfg80211_beacon_data {
		size_t probe_resp_len;
		};

		struct mac_address {
		u8 addr[ETH_ALEN];
		};

		/**
		* struct cfg80211_acl_data - Access control list data
		*
		* @acl_policy: ACL policy to be applied on the station's
		entry specified by mac_addr
		* @n_acl_entries: Number of MAC address entries passed
		* @mac_addrs: List of MAC addresses of stations to be used for ACL
		*/
		struct cfg80211_acl_data {
		enum nl80211_acl_policy acl_policy;
		int n_acl_entries;

		/* Keep it last */
		struct mac_address mac_addrs[];
		};

		/**
		* struct cfg80211_ap_settings - AP configuration
		*
		@@ -546,6 +566,8 @@ struct cfg80211_beacon_data {
		* @inactivity_timeout: time in seconds to determine station's inactivity.
		* @p2p_ctwindow: P2P CT Window
		* @p2p_opp_ps: P2P opportunistic PS
		* @acl: ACL configuration used by the drivers which has support for
		* MAC address based access control
		*/
		struct cfg80211_ap_settings {
		struct cfg80211_chan_def chandef;
		@@ -562,6 +584,7 @@ struct cfg80211_ap_settings {
		int inactivity_timeout;
		u8 p2p_ctwindow;
		bool p2p_opp_ps;
		const struct cfg80211_acl_data *acl;
		};

		/**
		@@ -1796,6 +1819,13 @@ struct cfg80211_gtk_rekey_data {
		*
		* @start_p2p_device: Start the given P2P device.
		* @stop_p2p_device: Stop the given P2P device.
		*
		* @set_mac_acl: Sets MAC address control list in AP and P2P GO mode.
		* Parameters include ACL policy, an array of MAC address of stations
		* and the number of MAC addresses. If there is already a list in driver
		* this new list replaces the existing one. Driver has to clear its ACL
		* when number of MAC addresses entries is passed as 0. Drivers which
		* advertise the support for MAC based ACL have to implement this callback.
		*/
		struct cfg80211_ops {
		int (suspend)(struct wiphy wiphy, struct cfg80211_wowlan *wow);
		@@ -2016,6 +2046,9 @@ struct cfg80211_ops {
		struct wireless_dev *wdev);
		void (stop_p2p_device)(struct wiphy wiphy,
		struct wireless_dev *wdev);

		int (set_mac_acl)(struct wiphy wiphy, struct net_device *dev,
		const struct cfg80211_acl_data *params);
		};

		/*
		@@ -2181,10 +2214,6 @@ struct ieee80211_iface_combination {
		u8 radar_detect_widths;
		};

		struct mac_address {
		u8 addr[ETH_ALEN];
		};

		struct ieee80211_txrx_stypes {
		u16 tx, rx;
		};
		@@ -2325,6 +2354,9 @@ struct wiphy_wowlan_support {
		* @ap_sme_capa: AP SME capabilities, flags from &enum nl80211_ap_sme_features.
		* @ht_capa_mod_mask: Specify what ht_cap values can be over-ridden.
		* If null, then none can be over-ridden.
		*
		* @max_acl_mac_addrs: Maximum number of MAC addresses that the device
		* supports for ACL.
		*/
		struct wiphy {
		/* assign these fields before you register the wiphy */
		@@ -2346,6 +2378,8 @@ struct wiphy {
		/* Supported interface modes, OR together BIT(NL80211_IFTYPE_...) */
		u16 interface_modes;

		u16 max_acl_mac_addrs;

		u32 flags, features;

		u32 ap_sme_capa;