Merge tag 'mac80211-next-for-davem-2018-03-29' of... (e15f20ea) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/wireless/mac80211_hwsim.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -2584,8 +2584,8 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
		addr[4] = idx;
		memcpy(data->addresses[0].addr, addr, ETH_ALEN);
		/* Why need here second address ? */
		data->addresses[1].addr[0] \|= 0x40;
		memcpy(data->addresses[1].addr, addr, ETH_ALEN);
		data->addresses[1].addr[0] \|= 0x40;
		hw->wiphy->n_addresses = 2;
		hw->wiphy->addresses = data->addresses;
		/* possible address clash is checked at hash table insertion */
		@@ -3529,8 +3529,12 @@ static void __net_exit hwsim_exit_net(struct net *net)
		list_del(&data->list);
		rhashtable_remove_fast(&hwsim_radios_rht, &data->rht,
		hwsim_rht_params);
		INIT_WORK(&data->destroy_work, destroy_radio);
		queue_work(hwsim_wq, &data->destroy_work);
		hwsim_radios_generation++;
		spin_unlock_bh(&hwsim_radio_lock);
		mac80211_hwsim_del_radio(data,
		wiphy_name(data->hw->wiphy),
		NULL);
		spin_lock_bh(&hwsim_radio_lock);
		}
		spin_unlock_bh(&hwsim_radio_lock);

include/net/cfg80211.h

+72 −4

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@
		* Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
		* Copyright 2013-2014 Intel Mobile Communications GmbH
		* Copyright 2015-2017 Intel Deutschland GmbH
		* Copyright (C) 2018 Intel Corporation
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		@@ -646,6 +647,8 @@ struct survey_info {
		* allowed through even on unauthorized ports
		* @control_port_no_encrypt: TRUE to prevent encryption of control port
		* protocol frames.
		* @control_port_over_nl80211: TRUE if userspace expects to exchange control
		* port frames over NL80211 instead of the network interface.
		* @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
		@@ -661,6 +664,7 @@ struct cfg80211_crypto_settings {
		bool control_port;
		__be16 control_port_ethertype;
		bool control_port_no_encrypt;
		bool control_port_over_nl80211;
		struct key_params *wep_keys;
		int wep_tx_key;
		const u8 *psk;
		@@ -1450,6 +1454,8 @@ struct mesh_config {
		* @userspace_handles_dfs: whether user space controls DFS operation, i.e.
		* changes the channel when a radar is detected. This is required
		* to operate on DFS channels.
		* @control_port_over_nl80211: TRUE if userspace expects to exchange control
		* port frames over NL80211 instead of the network interface.
		*
		* These parameters are fixed when the mesh is created.
		*/
		@@ -1472,6 +1478,7 @@ struct mesh_setup {
		u32 basic_rates;
		struct cfg80211_bitrate_mask beacon_rate;
		bool userspace_handles_dfs;
		bool control_port_over_nl80211;
		};

		/**
		@@ -2030,6 +2037,8 @@ struct cfg80211_disassoc_request {
		* sets/clears %NL80211_STA_FLAG_AUTHORIZED. If true, the driver is
		* required to assume that the port is unauthorized until authorized by
		* user space. Otherwise, port is marked authorized by default.
		* @control_port_over_nl80211: TRUE if userspace expects to exchange control
		* port frames over NL80211 instead of the network interface.
		* @userspace_handles_dfs: whether user space controls DFS operation, i.e.
		* changes the channel when a radar is detected. This is required
		* to operate on DFS channels.
		@@ -2053,6 +2062,7 @@ struct cfg80211_ibss_params {
		bool channel_fixed;
		bool privacy;
		bool control_port;
		bool control_port_over_nl80211;
		bool userspace_handles_dfs;
		int mcast_rate[NUM_NL80211_BANDS];
		struct ieee80211_ht_cap ht_capa;
		@@ -2960,6 +2970,9 @@ struct cfg80211_external_auth_params {
		*
		* @external_auth: indicates result of offloaded authentication processing from
		* user space
		*
		* @tx_control_port: TX a control port frame (EAPoL). The noencrypt parameter
		* tells the driver that the frame should not be encrypted.
		*/
		struct cfg80211_ops {
		int (suspend)(struct wiphy wiphy, struct cfg80211_wowlan *wow);
		@@ -3255,6 +3268,12 @@ struct cfg80211_ops {
		const u8 *aa);
		int (external_auth)(struct wiphy wiphy, struct net_device *dev,
		struct cfg80211_external_auth_params *params);

		int (tx_control_port)(struct wiphy wiphy,
		struct net_device *dev,
		const u8 *buf, size_t len,
		const u8 *dest, const __be16 proto,
		const bool noencrypt);
		};

		/*
		@@ -3572,15 +3591,15 @@ enum wiphy_opmode_flag {
		/**
		* struct sta_opmode_info - Station's ht/vht operation mode information
		* @changed: contains value from &enum wiphy_opmode_flag
		* @smps_mode: New SMPS mode of a station
		* @bw: new max bandwidth value of a station
		* @smps_mode: New SMPS mode value from &enum nl80211_smps_mode of a station
		* @bw: new max bandwidth value from &enum nl80211_chan_width of a station
		* @rx_nss: new rx_nss value of a station
		*/

		struct sta_opmode_info {
		u32 changed;
		u8 smps_mode;
		u8 bw;
		enum nl80211_smps_mode smps_mode;
		enum nl80211_chan_width bw;
		u8 rx_nss;
		};

		@@ -4657,6 +4676,33 @@ const struct ieee80211_reg_rule freq_reg_info(struct wiphy wiphy,
		*/
		const char *reg_initiator_name(enum nl80211_reg_initiator initiator);

		/**
		* DOC: Internal regulatory db functions
		*
		*/

		/**
		* reg_query_regdb_wmm - Query internal regulatory db for wmm rule
		* Regulatory self-managed driver can use it to proactively
		*
		* @alpha2: the ISO/IEC 3166 alpha2 wmm rule to be queried.
		* @freq: the freqency(in MHz) to be queried.
		* @ptr: pointer where the regdb wmm data is to be stored (or %NULL if
		* irrelevant). This can be used later for deduplication.
		* @rule: pointer to store the wmm rule from the regulatory db.
		*
		* Self-managed wireless drivers can use this function to query
		* the internal regulatory database to check whether the given
		* ISO/IEC 3166 alpha2 country and freq have wmm rule limitations.
		*
		* Drivers should check the return value, its possible you can get
		* an -ENODATA.
		*
		* Return: 0 on success. -ENODATA.
		*/
		int reg_query_regdb_wmm(char alpha2, int freq, u32 ptr,
		struct ieee80211_wmm_rule *rule);

		/*
		* callbacks for asynchronous cfg80211 methods, notification
		* functions and BSS handling helpers
		@@ -5693,6 +5739,28 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie,
		const u8 *buf, size_t len, bool ack, gfp_t gfp);


		/**
		* cfg80211_rx_control_port - notification about a received control port frame
		* @dev: The device the frame matched to
		* @buf: control port frame
		* @len: length of the frame data
		* @addr: The peer from which the frame was received
		* @proto: frame protocol, typically PAE or Pre-authentication
		* @unencrypted: Whether the frame was received unencrypted
		*
		* This function is used to inform userspace about a received control port
		* frame. It should only be used if userspace indicated it wants to receive
		* control port frames over nl80211.
		*
		* The frame is the data portion of the 802.3 or 802.11 data frame with all
		* network layer headers removed (e.g. the raw EAPoL frame).
		*
		* Return: %true if the frame was passed to userspace
		*/
		bool cfg80211_rx_control_port(struct net_device *dev,
		const u8 *buf, size_t len,
		const u8 *addr, u16 proto, bool unencrypted);

		/**
		* cfg80211_cqm_rssi_notify - connection quality monitoring rssi event
		* @dev: network device

include/net/mac80211.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -302,6 +302,8 @@ struct ieee80211_vif_chanctx_switch {
		* @BSS_CHANGED_MU_GROUPS: VHT MU-MIMO group id or user position changed
		* @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
		*
		*/
		enum ieee80211_bss_change {
		BSS_CHANGED_ASSOC = 1<<0,
		@@ -329,6 +331,7 @@ enum ieee80211_bss_change {
		BSS_CHANGED_OCB = 1<<22,
		BSS_CHANGED_MU_GROUPS = 1<<23,
		BSS_CHANGED_KEEP_ALIVE = 1<<24,
		BSS_CHANGED_MCAST_RATE = 1<<25,

		/* when adding here, make sure to change ieee80211_reconfig */
		};

include/net/regulatory.h

+28 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		* regulatory support structures
		*
		* Copyright 2008-2009 Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
		* Copyright (C) 2018 Intel Corporation
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		@@ -188,9 +189,35 @@ struct ieee80211_power_rule {
		u32 max_eirp;
		};

		/**
		* struct ieee80211_wmm_ac - used to store per ac wmm regulatory limitation
		*
		* The information provided in this structure is required for QoS
		* transmit queue configuration. Cf. IEEE 802.11 7.3.2.29.
		*
		* @cw_min: minimum contention window [a value of the form
		* 2^n-1 in the range 1..32767]
		* @cw_max: maximum contention window [like @cw_min]
		* @cot: maximum burst time in units of 32 usecs, 0 meaning disabled
		* @aifsn: arbitration interframe space [0..255]
		*
		*/
		struct ieee80211_wmm_ac {
		u16 cw_min;
		u16 cw_max;
		u16 cot;
		u8 aifsn;
		};

		struct ieee80211_wmm_rule {
		struct ieee80211_wmm_ac client[IEEE80211_NUM_ACS];
		struct ieee80211_wmm_ac ap[IEEE80211_NUM_ACS];
		};

		struct ieee80211_reg_rule {
		struct ieee80211_freq_range freq_range;
		struct ieee80211_power_rule power_rule;
		struct ieee80211_wmm_rule *wmm_rule;
		u32 flags;
		u32 dfs_cac_ms;
		};
		@@ -198,6 +225,7 @@ struct ieee80211_reg_rule {
		struct ieee80211_regdomain {
		struct rcu_head rcu_head;
		u32 n_reg_rules;
		u32 n_wmm_rules;
		char alpha2[3];
		enum nl80211_dfs_regions dfs_region;
		struct ieee80211_reg_rule reg_rules[];

include/uapi/linux/nl80211.h

+45 −1

Original line number	Diff line number	Diff line
		@@ -542,7 +542,8 @@
		* IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,
		* %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
		* %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
		* %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, %NL80211_ATTR_MAC_HINT, and
		* %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT,
		* %NL80211_ATTR_CONTROL_PORT_OVER_NL80211, %NL80211_ATTR_MAC_HINT, and
		* %NL80211_ATTR_WIPHY_FREQ_HINT.
		* If included, %NL80211_ATTR_MAC and %NL80211_ATTR_WIPHY_FREQ are
		* restrictions on BSS selection, i.e., they effectively prevent roaming
		@@ -990,6 +991,17 @@
		* &NL80211_CMD_CONNECT or &NL80211_CMD_ROAM. If the 4 way handshake failed
		* &NL80211_CMD_DISCONNECT should be indicated instead.
		*
		* @NL80211_CMD_CONTROL_PORT_FRAME: Control Port (e.g. PAE) frame TX request
		* and RX notification. This command is used both as a request to transmit
		* a control port frame and as a notification that a control port frame
		* has been received. %NL80211_ATTR_FRAME is used to specify the
		* frame contents. The frame is the raw EAPoL data, without ethernet or
		* 802.11 headers.
		* When used as an event indication %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
		* %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT and %NL80211_ATTR_MAC are added
		* indicating the protocol type of the received frame; whether the frame
		* was received unencrypted and the MAC address of the peer respectively.
		*
		* @NL80211_CMD_RELOAD_REGDB: Request that the regdb firmware file is reloaded.
		*
		* @NL80211_CMD_EXTERNAL_AUTH: This interface is exclusively defined for host
		@@ -1228,6 +1240,8 @@ enum nl80211_commands {

		NL80211_CMD_STA_OPMODE_CHANGED,

		NL80211_CMD_CONTROL_PORT_FRAME,

		/* add new commands above here */

		/* used to define NL80211_CMD_MAX below */
		@@ -1475,6 +1489,15 @@ enum nl80211_commands {
		* @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with
		* %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom
		* ethertype frames used for key negotiation must not be encrypted.
		* @NL80211_ATTR_CONTROL_PORT_OVER_NL80211: A flag indicating whether control
		* port frames (e.g. of type given in %NL80211_ATTR_CONTROL_PORT_ETHERTYPE)
		* will be sent directly to the network interface or sent via the NL80211
		* socket. If this attribute is missing, then legacy behavior of sending
		* control port frames directly to the network interface is used. If the
		* flag is included, then control port frames are sent over NL80211 instead
		* using %CMD_CONTROL_PORT_FRAME. If control port routing over NL80211 is
		* to be used then userspace must also use the %NL80211_ATTR_SOCKET_OWNER
		* flag.
		*
		* @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
		* We recommend using nested, driver-specific attributes within this.
		@@ -1962,6 +1985,12 @@ enum nl80211_commands {
		* multicast group.
		* If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the
		* station will deauthenticate when the socket is closed.
		* If set during %NL80211_CMD_JOIN_IBSS the IBSS will be automatically
		* torn down when the socket is closed.
		* If set during %NL80211_CMD_JOIN_MESH the mesh setup will be
		* automatically torn down when the socket is closed.
		* If set during %NL80211_CMD_START_AP the AP will be automatically
		* disabled when the socket is closed.
		*
		* @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
		* the TDLS link initiator.
		@@ -2628,6 +2657,8 @@ enum nl80211_attrs {
		NL80211_ATTR_NSS,
		NL80211_ATTR_ACK_SIGNAL,

		NL80211_ATTR_CONTROL_PORT_OVER_NL80211,

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

		__NL80211_ATTR_AFTER_LAST,
		@@ -4999,6 +5030,14 @@ enum nl80211_feature_flags {
		* @NL80211_EXT_FEATURE_LOW_SPAN_SCAN: Driver supports low span scan.
		* @NL80211_EXT_FEATURE_LOW_POWER_SCAN: Driver supports low power scan.
		* @NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN: Driver supports high accuracy scan.
		* @NL80211_EXT_FEATURE_DFS_OFFLOAD: HW/driver will offload DFS actions.
		* Device or driver will do all DFS-related actions by itself,
		* informing user-space about CAC progress, radar detection event,
		* channel change triggered by radar detection event.
		* No need to start CAC from user-space, no need to react to
		* "radar detected" event.
		* @NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211: Driver supports sending and
		* receiving control port frames over nl80211 instead of the netdevice.
		*
		* @NUM_NL80211_EXT_FEATURES: number of extended features.
		* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
		@@ -5029,6 +5068,8 @@ enum nl80211_ext_feature_index {
		NL80211_EXT_FEATURE_LOW_SPAN_SCAN,
		NL80211_EXT_FEATURE_LOW_POWER_SCAN,
		NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN,
		NL80211_EXT_FEATURE_DFS_OFFLOAD,
		NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211,

		/* add new features before the definition below */
		NUM_NL80211_EXT_FEATURES,
		@@ -5204,6 +5245,8 @@ enum nl80211_smps_mode {
		* non-operating channel is expired and no longer valid. New CAC must
		* be done on this channel before starting the operation. This is not
		* applicable for ETSI dfs domain where pre-CAC is valid for ever.
		* @NL80211_RADAR_CAC_STARTED: Channel Availability Check has been started,
		* should be generated by HW if NL80211_EXT_FEATURE_DFS_OFFLOAD is enabled.
		*/
		enum nl80211_radar_event {
		NL80211_RADAR_DETECTED,
		@@ -5211,6 +5254,7 @@ enum nl80211_radar_event {
		NL80211_RADAR_CAC_ABORTED,
		NL80211_RADAR_NOP_FINISHED,
		NL80211_RADAR_PRE_CAC_EXPIRED,
		NL80211_RADAR_CAC_STARTED,
		};

		/**