Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60772e48 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2018-02-22' of... 

Merge tag 'mac80211-next-for-davem-2018-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
Various updates across wireless.

One thing to note: I've included a new ethertype
that wireless uses (ETH_P_PREAUTH) in if_ether.h.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 82e3be32 94ba9271

drivers/net/wireless/ath/wil6210/cfg80211.c

+2 −1
Original line number Diff line number Diff line
@@ -1599,7 +1599,8 @@ static void wil_probe_client_handle(struct wil6210_priv *wil, 
	 */

	bool alive = (sta->status == wil_sta_connected);



	cfg80211_probe_status(ndev, sta->addr, req->cookie, alive, GFP_KERNEL);

	cfg80211_probe_status(ndev, sta->addr, req->cookie, alive,

			      0, false, GFP_KERNEL);

}



static struct list_head *next_probe_client(struct wil6210_priv *wil)

drivers/net/wireless/mac80211_hwsim.c

+63 −18
Original line number Diff line number Diff line
@@ -493,6 +493,7 @@ static LIST_HEAD(hwsim_radios); 
static struct workqueue_struct *hwsim_wq;

static struct rhashtable hwsim_radios_rht;

static int hwsim_radio_idx;

static int hwsim_radios_generation = 1;



static struct platform_driver mac80211_hwsim_driver = {

	.driver = {
@@ -637,6 +638,7 @@ static const struct nla_policy hwsim_genl_policy[HWSIM_ATTR_MAX + 1] = { 
	[HWSIM_ATTR_RADIO_NAME] = { .type = NLA_STRING },

	[HWSIM_ATTR_NO_VIF] = { .type = NLA_FLAG },

	[HWSIM_ATTR_FREQ] = { .type = NLA_U32 },

	[HWSIM_ATTR_PERM_ADDR] = { .type = NLA_UNSPEC, .len = ETH_ALEN },

};



static void mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
@@ -2408,6 +2410,7 @@ struct hwsim_new_radio_params { 
	bool destroy_on_close;

	const char *hwname;

	bool no_vif;

	const u8 *perm_addr;

};



static void hwsim_mcast_config_msg(struct sk_buff *mcast_skb,
@@ -2572,15 +2575,25 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
	skb_queue_head_init(&data->pending);



	SET_IEEE80211_DEV(hw, data->dev);

	if (!param->perm_addr) {

		eth_zero_addr(addr);

		addr[0] = 0x02;

		addr[3] = idx >> 8;

		addr[4] = idx;

		memcpy(data->addresses[0].addr, addr, ETH_ALEN);

	memcpy(data->addresses[1].addr, addr, ETH_ALEN);

		/* Why need here second address ? */

		data->addresses[1].addr[0] |= 0x40;

		memcpy(data->addresses[1].addr, addr, ETH_ALEN);

		hw->wiphy->n_addresses = 2;

		hw->wiphy->addresses = data->addresses;

		/* possible address clash is checked at hash table insertion */

	} else {

		memcpy(data->addresses[0].addr, param->perm_addr, ETH_ALEN);

		/* compatibility with automatically generated mac addr */

		memcpy(data->addresses[1].addr, param->perm_addr, ETH_ALEN);

		hw->wiphy->n_addresses = 2;

		hw->wiphy->addresses = data->addresses;

	}



	data->channels = param->channels;

	data->use_chanctx = param->use_chanctx;
@@ -2785,13 +2798,17 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
	err = rhashtable_insert_fast(&hwsim_radios_rht, &data->rht,

				     hwsim_rht_params);

	if (err < 0) {

		pr_debug("mac80211_hwsim: radio index %d already present\n",

			 idx);

		if (info) {

			GENL_SET_ERR_MSG(info, "perm addr already present");

			NL_SET_BAD_ATTR(info->extack,

					info->attrs[HWSIM_ATTR_PERM_ADDR]);

		}

		spin_unlock_bh(&hwsim_radio_lock);

		goto failed_final_insert;

	}



	list_add_tail(&data->list, &hwsim_radios);

	hwsim_radios_generation++;

	spin_unlock_bh(&hwsim_radio_lock);



	if (idx > 0)
@@ -3210,6 +3227,19 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info) 
		param.regd = hwsim_world_regdom_custom[idx];

	}



	if (info->attrs[HWSIM_ATTR_PERM_ADDR]) {

		if (!is_valid_ether_addr(

				nla_data(info->attrs[HWSIM_ATTR_PERM_ADDR]))) {

			GENL_SET_ERR_MSG(info,"MAC is no valid source addr");

			NL_SET_BAD_ATTR(info->extack,

					info->attrs[HWSIM_ATTR_PERM_ADDR]);

			return -EINVAL;

		}





		param.perm_addr = nla_data(info->attrs[HWSIM_ATTR_PERM_ADDR]);

	}



	ret = mac80211_hwsim_new_radio(info, &param);

	kfree(hwname);

	return ret;
@@ -3249,6 +3279,7 @@ static int hwsim_del_radio_nl(struct sk_buff *msg, struct genl_info *info) 
		list_del(&data->list);

		rhashtable_remove_fast(&hwsim_radios_rht, &data->rht,

				       hwsim_rht_params);

		hwsim_radios_generation++;

		spin_unlock_bh(&hwsim_radio_lock);

		mac80211_hwsim_del_radio(data, wiphy_name(data->hw->wiphy),

					 info);
@@ -3305,17 +3336,19 @@ static int hwsim_get_radio_nl(struct sk_buff *msg, struct genl_info *info) 
static int hwsim_dump_radio_nl(struct sk_buff *skb,

			       struct netlink_callback *cb)

{

	int idx = cb->args[0];

	int last_idx = cb->args[0];

	struct mac80211_hwsim_data *data = NULL;

	int res;

	int res = 0;

	void *hdr;



	spin_lock_bh(&hwsim_radio_lock);

	cb->seq = hwsim_radios_generation;



	if (idx == hwsim_radio_idx)

	if (last_idx >= hwsim_radio_idx-1)

		goto done;



	list_for_each_entry(data, &hwsim_radios, list) {

		if (data->idx < idx)

		if (data->idx <= last_idx)

			continue;



		if (!net_eq(wiphy_net(data->hw->wiphy), sock_net(skb->sk)))
@@ -3328,14 +3361,25 @@ static int hwsim_dump_radio_nl(struct sk_buff *skb, 
		if (res < 0)

			break;



		idx = data->idx + 1;

		last_idx = data->idx;

	}



	cb->args[0] = idx;

	cb->args[0] = last_idx;



	/* list changed, but no new element sent, set interrupted flag */

	if (skb->len == 0 && cb->prev_seq && cb->seq != cb->prev_seq) {

		hdr = genlmsg_put(skb, NETLINK_CB(cb->skb).portid,

				  cb->nlh->nlmsg_seq, &hwsim_genl_family,

				  NLM_F_MULTI, HWSIM_CMD_GET_RADIO);

		if (!hdr)

			res = -EMSGSIZE;

		genl_dump_check_consistent(cb, hdr);

		genlmsg_end(skb, hdr);

	}



done:

	spin_unlock_bh(&hwsim_radio_lock);

	return skb->len;

	return res ?: skb->len;

}



/* Generic Netlink operations array */
@@ -3393,6 +3437,7 @@ static void destroy_radio(struct work_struct *work) 
	struct mac80211_hwsim_data *data =

		container_of(work, struct mac80211_hwsim_data, destroy_work);



	hwsim_radios_generation++;

	mac80211_hwsim_del_radio(data, wiphy_name(data->hw->wiphy), NULL);

}

drivers/net/wireless/mac80211_hwsim.h

+8 −1
Original line number Diff line number Diff line
@@ -68,7 +68,12 @@ enum hwsim_tx_control_flags { 
 *	%HWSIM_ATTR_SIGNAL, %HWSIM_ATTR_COOKIE

 * @HWSIM_CMD_NEW_RADIO: create a new radio with the given parameters,

 *	returns the radio ID (>= 0) or negative on errors, if successful

 *	then multicast the result

 *	then multicast the result, uses optional parameter:

 *	%HWSIM_ATTR_REG_STRICT_REG, %HWSIM_ATTR_SUPPORT_P2P_DEVICE,

 *	%HWSIM_ATTR_DESTROY_RADIO_ON_CLOSE, %HWSIM_ATTR_CHANNELS,

 *	%HWSIM_ATTR_NO_VIF, %HWSIM_ATTR_RADIO_NAME, %HWSIM_ATTR_USE_CHANCTX,

 *	%HWSIM_ATTR_REG_HINT_ALPHA2, %HWSIM_ATTR_REG_CUSTOM_REG,

 *	%HWSIM_ATTR_PERM_ADDR

 * @HWSIM_CMD_DEL_RADIO: destroy a radio, reply is multicasted

 * @HWSIM_CMD_GET_RADIO: fetch information about existing radios, uses:

 *	%HWSIM_ATTR_RADIO_ID
@@ -126,6 +131,7 @@ enum { 
 * @HWSIM_ATTR_FREQ: Frequency at which packet is transmitted or received.

 * @HWSIM_ATTR_TX_INFO_FLAGS: additional flags for corresponding

 *	rates of %HWSIM_ATTR_TX_INFO

 * @HWSIM_ATTR_PERM_ADDR: permanent mac address of new radio

 * @__HWSIM_ATTR_MAX: enum limit

 */
@@ -153,6 +159,7 @@ enum { 
	HWSIM_ATTR_FREQ,

	HWSIM_ATTR_PAD,

	HWSIM_ATTR_TX_INFO_FLAGS,

	HWSIM_ATTR_PERM_ADDR,

	__HWSIM_ATTR_MAX,

};

#define HWSIM_ATTR_MAX (__HWSIM_ATTR_MAX - 1)

include/linux/ieee80211.h

+13 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>

 * Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright (c) 2016 - 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
@@ -2111,7 +2112,7 @@ enum ieee80211_key_len { 
#define FILS_ERP_MAX_REALM_LEN		253

#define FILS_ERP_MAX_RRK_LEN		64



#define PMK_MAX_LEN			48

#define PMK_MAX_LEN			64



/* Public action codes (IEEE Std 802.11-2016, 9.6.8.1, Table 9-307) */

enum ieee80211_pub_actioncode {
@@ -2501,6 +2502,17 @@ static inline u8 *ieee80211_get_qos_ctl(struct ieee80211_hdr *hdr) 
		return (u8 *)hdr + 24;

}



/**

 * ieee80211_get_tid - get qos TID

 * @hdr: the frame

 */

static inline u8 ieee80211_get_tid(struct ieee80211_hdr *hdr)

{

	u8 *qc = ieee80211_get_qos_ctl(hdr);



	return qc[0] & IEEE80211_QOS_CTL_TID_MASK;

}



/**

 * ieee80211_get_SA - get pointer to SA

 * @hdr: the frame

include/net/cfg80211.h

+100 −4
Original line number Diff line number Diff line
@@ -1147,6 +1147,7 @@ struct cfg80211_tid_stats { 
 * @rx_duration: aggregate PPDU duration(usecs) for all the frames from a peer

 * @pertid: per-TID statistics, see &struct cfg80211_tid_stats, using the last

 *	(IEEE80211_NUM_TIDS) index for MSDUs not encapsulated in QoS-MPDUs.

 * @ack_signal: signal strength (in dBm) of the last ACK frame.

 */

struct station_info {

	u64 filled;
@@ -1191,6 +1192,7 @@ struct station_info { 
	u64 rx_duration;

	u8 rx_beacon_signal_avg;

	struct cfg80211_tid_stats pertid[IEEE80211_NUM_TIDS + 1];

	s8 ack_signal;

};



#if IS_ENABLED(CONFIG_CFG80211)
@@ -1905,11 +1907,16 @@ struct cfg80211_auth_request { 
 * @ASSOC_REQ_DISABLE_HT:  Disable HT (802.11n)

 * @ASSOC_REQ_DISABLE_VHT:  Disable VHT

 * @ASSOC_REQ_USE_RRM: Declare RRM capability in this association

 * @CONNECT_REQ_EXTERNAL_AUTH_SUPPORT: User space indicates external

 *	authentication capability. Drivers can offload authentication to

 *	userspace if this flag is set. Only applicable for cfg80211_connect()

 *	request (connect callback).

 */

enum cfg80211_assoc_req_flags {

	ASSOC_REQ_DISABLE_HT			= BIT(0),

	ASSOC_REQ_DISABLE_VHT			= BIT(1),

	ASSOC_REQ_USE_RRM			= BIT(2),

	CONNECT_REQ_EXTERNAL_AUTH_SUPPORT	= BIT(3),

};



/**
@@ -2600,6 +2607,33 @@ struct cfg80211_pmk_conf { 
	const u8 *pmk_r0_name;

};



/**

 * struct cfg80211_external_auth_params - Trigger External authentication.

 *

 * Commonly used across the external auth request and event interfaces.

 *

 * @action: action type / trigger for external authentication. Only significant

 *	for the authentication request event interface (driver to user space).

 * @bssid: BSSID of the peer with which the authentication has

 *	to happen. Used by both the authentication request event and

 *	authentication response command interface.

 * @ssid: SSID of the AP.  Used by both the authentication request event and

 *	authentication response command interface.

 * @key_mgmt_suite: AKM suite of the respective authentication. Used by the

 *	authentication request event interface.

 * @status: status code, %WLAN_STATUS_SUCCESS for successful authentication,

 *	use %WLAN_STATUS_UNSPECIFIED_FAILURE if user space cannot give you

 *	the real status code for failures. Used only for the authentication

 *	response command interface (user space to driver).

 */

struct cfg80211_external_auth_params {

	enum nl80211_external_auth_action action;

	u8 bssid[ETH_ALEN] __aligned(2);

	struct cfg80211_ssid ssid;

	unsigned int key_mgmt_suite;

	u16 status;

};



/**

 * struct cfg80211_ops - backend description for wireless configuration

 *
@@ -2923,6 +2957,9 @@ struct cfg80211_pmk_conf { 
 *	(invoked with the wireless_dev mutex held)

 * @del_pmk: delete the previously configured PMK for the given authenticator.

 *	(invoked with the wireless_dev mutex held)

 *

 * @external_auth: indicates result of offloaded authentication processing from

 *     user space

 */

struct cfg80211_ops {

	int	(*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
@@ -3216,6 +3253,8 @@ struct cfg80211_ops { 
			   const struct cfg80211_pmk_conf *conf);

	int	(*del_pmk)(struct wiphy *wiphy, struct net_device *dev,

			   const u8 *aa);

	int     (*external_auth)(struct wiphy *wiphy, struct net_device *dev,

				 struct cfg80211_external_auth_params *params);

};



/*
@@ -3516,6 +3555,35 @@ enum wiphy_vendor_command_flags { 
	WIPHY_VENDOR_CMD_NEED_RUNNING = BIT(2),

};



/**

 * enum wiphy_opmode_flag - Station's ht/vht operation mode information flags

 *

 * @STA_OPMODE_MAX_BW_CHANGED: Max Bandwidth changed

 * @STA_OPMODE_SMPS_MODE_CHANGED: SMPS mode changed

 * @STA_OPMODE_N_SS_CHANGED: max N_SS (number of spatial streams) changed

 *

 */

enum wiphy_opmode_flag {

	STA_OPMODE_MAX_BW_CHANGED	= BIT(0),

	STA_OPMODE_SMPS_MODE_CHANGED	= BIT(1),

	STA_OPMODE_N_SS_CHANGED		= BIT(2),

};



/**

 * 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

 * @rx_nss: new rx_nss value of a station

 */



struct sta_opmode_info {

	u32 changed;

	u8 smps_mode;

	u8 bw;

	u8 rx_nss;

};



/**

 * struct wiphy_vendor_command - vendor command definition

 * @info: vendor command identifying information, as used in nl80211
@@ -5684,6 +5752,20 @@ void cfg80211_cqm_beacon_loss_notify(struct net_device *dev, gfp_t gfp); 
void cfg80211_radar_event(struct wiphy *wiphy,

			  struct cfg80211_chan_def *chandef, gfp_t gfp);



/**

 * cfg80211_sta_opmode_change_notify - STA's ht/vht operation mode change event

 * @dev: network device

 * @mac: MAC address of a station which opmode got modified

 * @sta_opmode: station's current opmode value

 * @gfp: context flags

 *

 * Driver should call this function when station's opmode modified via action

 * frame.

 */

void cfg80211_sta_opmode_change_notify(struct net_device *dev, const u8 *mac,

				       struct sta_opmode_info *sta_opmode,

				       gfp_t gfp);



/**

 * cfg80211_cac_event - Channel availability check (CAC) event

 * @netdev: network device
@@ -5758,10 +5840,13 @@ bool cfg80211_rx_unexpected_4addr_frame(struct net_device *dev, 
 * @addr: the address of the peer

 * @cookie: the cookie filled in @probe_client previously

 * @acked: indicates whether probe was acked or not

 * @ack_signal: signal strength (in dBm) of the ACK frame.

 * @is_valid_ack_signal: indicates the ack_signal is valid or not.

 * @gfp: allocation flags

 */

void cfg80211_probe_status(struct net_device *dev, const u8 *addr,

			   u64 cookie, bool acked, gfp_t gfp);

			   u64 cookie, bool acked, s32 ack_signal,

			   bool is_valid_ack_signal, gfp_t gfp);



/**

 * cfg80211_report_obss_beacon - report beacon from other APs
@@ -6202,6 +6287,17 @@ void cfg80211_nan_func_terminated(struct wireless_dev *wdev, 
/* ethtool helper */

void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info);



/**

 * cfg80211_external_auth_request - userspace request for authentication

 * @netdev: network device

 * @params: External authentication parameters

 * @gfp: allocation flags

 * Returns: 0 on success, < 0 on error

 */

int cfg80211_external_auth_request(struct net_device *netdev,

				   struct cfg80211_external_auth_params *params,

				   gfp_t gfp);



/* Logging, debugging and troubleshooting/diagnostic helpers. */



/* wiphy_printk helpers, similar to dev_printk */