Merge tag 'mac80211-next-for-davem-2018-01-22' of... (291040cd) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/wireless/mac80211_hwsim.c

+76 −18

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#include <net/genetlink.h>
		#include <net/net_namespace.h>
		#include <net/netns/generic.h>
		#include <linux/rhashtable.h>
		#include "mac80211_hwsim.h"

		#define WARN_QUEUE 100
		@@ -490,6 +491,7 @@ static const struct ieee80211_iface_combination hwsim_if_comb_p2p_dev[] = {
		static spinlock_t hwsim_radio_lock;
		static LIST_HEAD(hwsim_radios);
		static struct workqueue_struct *hwsim_wq;
		static struct rhashtable hwsim_radios_rht;
		static int hwsim_radio_idx;

		static struct platform_driver mac80211_hwsim_driver = {
		@@ -500,6 +502,7 @@ static struct platform_driver mac80211_hwsim_driver = {

		struct mac80211_hwsim_data {
		struct list_head list;
		struct rhash_head rht;
		struct ieee80211_hw *hw;
		struct device *dev;
		struct ieee80211_supported_band bands[NUM_NL80211_BANDS];
		@@ -574,6 +577,13 @@ struct mac80211_hwsim_data {
		u64 tx_failed;
		};

		static const struct rhashtable_params hwsim_rht_params = {
		.nelem_hint = 2,
		.automatic_shrinking = true,
		.key_len = ETH_ALEN,
		.key_offset = offsetof(struct mac80211_hwsim_data, addresses[1]),
		.head_offset = offsetof(struct mac80211_hwsim_data, rht),
		};

		struct hwsim_radiotap_hdr {
		struct ieee80211_radiotap_header hdr;
		@@ -1009,6 +1019,36 @@ static int hwsim_unicast_netgroup(struct mac80211_hwsim_data *data,
		return res;
		}

		static inline u16 trans_tx_rate_flags_ieee2hwsim(struct ieee80211_tx_rate *rate)
		{
		u16 result = 0;

		if (rate->flags & IEEE80211_TX_RC_USE_RTS_CTS)
		result \|= MAC80211_HWSIM_TX_RC_USE_RTS_CTS;
		if (rate->flags & IEEE80211_TX_RC_USE_CTS_PROTECT)
		result \|= MAC80211_HWSIM_TX_RC_USE_CTS_PROTECT;
		if (rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)
		result \|= MAC80211_HWSIM_TX_RC_USE_SHORT_PREAMBLE;
		if (rate->flags & IEEE80211_TX_RC_MCS)
		result \|= MAC80211_HWSIM_TX_RC_MCS;
		if (rate->flags & IEEE80211_TX_RC_GREEN_FIELD)
		result \|= MAC80211_HWSIM_TX_RC_GREEN_FIELD;
		if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
		result \|= MAC80211_HWSIM_TX_RC_40_MHZ_WIDTH;
		if (rate->flags & IEEE80211_TX_RC_DUP_DATA)
		result \|= MAC80211_HWSIM_TX_RC_DUP_DATA;
		if (rate->flags & IEEE80211_TX_RC_SHORT_GI)
		result \|= MAC80211_HWSIM_TX_RC_SHORT_GI;
		if (rate->flags & IEEE80211_TX_RC_VHT_MCS)
		result \|= MAC80211_HWSIM_TX_RC_VHT_MCS;
		if (rate->flags & IEEE80211_TX_RC_80_MHZ_WIDTH)
		result \|= MAC80211_HWSIM_TX_RC_80_MHZ_WIDTH;
		if (rate->flags & IEEE80211_TX_RC_160_MHZ_WIDTH)
		result \|= MAC80211_HWSIM_TX_RC_160_MHZ_WIDTH;

		return result;
		}

		static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
		struct sk_buff *my_skb,
		int dst_portid)
		@@ -1021,6 +1061,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
		unsigned int hwsim_flags = 0;
		int i;
		struct hwsim_tx_rate tx_attempts[IEEE80211_TX_MAX_RATES];
		struct hwsim_tx_rate_flag tx_attempts_flags[IEEE80211_TX_MAX_RATES];
		uintptr_t cookie;

		if (data->ps != PS_DISABLED)
		@@ -1072,7 +1113,11 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,

		for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
		tx_attempts[i].idx = info->status.rates[i].idx;
		tx_attempts_flags[i].idx = info->status.rates[i].idx;
		tx_attempts[i].count = info->status.rates[i].count;
		tx_attempts_flags[i].flags =
		trans_tx_rate_flags_ieee2hwsim(
		&info->status.rates[i]);
		}

		if (nla_put(skb, HWSIM_ATTR_TX_INFO,
		@@ -1080,6 +1125,11 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
		tx_attempts))
		goto nla_put_failure;

		if (nla_put(skb, HWSIM_ATTR_TX_INFO_FLAGS,
		sizeof(struct hwsim_tx_rate_flag) * IEEE80211_TX_MAX_RATES,
		tx_attempts_flags))
		goto nla_put_failure;

		/* We create a cookie to identify this skb */
		data->pending_cookie++;
		cookie = data->pending_cookie;
		@@ -2732,6 +2782,15 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
		CLOCK_MONOTONIC, HRTIMER_MODE_ABS);

		spin_lock_bh(&hwsim_radio_lock);
		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);
		spin_unlock_bh(&hwsim_radio_lock);
		goto failed_final_insert;
		}

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

		@@ -2740,6 +2799,9 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,

		return idx;

		failed_final_insert:
		debugfs_remove_recursive(data->debugfs);
		ieee80211_unregister_hw(data->hw);
		failed_hw:
		device_release_driver(data->dev);
		failed_bind:
		@@ -2875,22 +2937,9 @@ static void hwsim_mon_setup(struct net_device *dev)

		static struct mac80211_hwsim_data get_hwsim_data_ref_from_addr(const u8 addr)
		{
		struct mac80211_hwsim_data *data;
		bool _found = false;

		spin_lock_bh(&hwsim_radio_lock);
		list_for_each_entry(data, &hwsim_radios, list) {
		if (memcmp(data->addresses[1].addr, addr, ETH_ALEN) == 0) {
		_found = true;
		break;
		}
		}
		spin_unlock_bh(&hwsim_radio_lock);

		if (!_found)
		return NULL;

		return data;
		return rhashtable_lookup_fast(&hwsim_radios_rht,
		addr,
		hwsim_rht_params);
		}

		static void hwsim_register_wmediumd(struct net *net, u32 portid)
		@@ -2975,7 +3024,6 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
		for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
		txi->status.rates[i].idx = tx_attempts[i].idx;
		txi->status.rates[i].count = tx_attempts[i].count;
		/txi->status.rates[i].flags = 0;/
		}

		txi->status.ack_signal = nla_get_u32(info->attrs[HWSIM_ATTR_SIGNAL]);
		@@ -3155,8 +3203,10 @@ static int hwsim_new_radio_nl(struct sk_buff msg, struct genl_info info)
		if (info->attrs[HWSIM_ATTR_REG_CUSTOM_REG]) {
		u32 idx = nla_get_u32(info->attrs[HWSIM_ATTR_REG_CUSTOM_REG]);

		if (idx >= ARRAY_SIZE(hwsim_world_regdom_custom))
		if (idx >= ARRAY_SIZE(hwsim_world_regdom_custom)) {
		kfree(hwname);
		return -EINVAL;
		}
		param.regd = hwsim_world_regdom_custom[idx];
		}

		@@ -3197,6 +3247,8 @@ static int hwsim_del_radio_nl(struct sk_buff msg, struct genl_info info)
		continue;

		list_del(&data->list);
		rhashtable_remove_fast(&hwsim_radios_rht, &data->rht,
		hwsim_rht_params);
		spin_unlock_bh(&hwsim_radio_lock);
		mac80211_hwsim_del_radio(data, wiphy_name(data->hw->wiphy),
		info);
		@@ -3352,6 +3404,8 @@ static void remove_user_radios(u32 portid)
		list_for_each_entry_safe(entry, tmp, &hwsim_radios, list) {
		if (entry->destroy_on_close && entry->portid == portid) {
		list_del(&entry->list);
		rhashtable_remove_fast(&hwsim_radios_rht, &entry->rht,
		hwsim_rht_params);
		INIT_WORK(&entry->destroy_work, destroy_radio);
		queue_work(hwsim_wq, &entry->destroy_work);
		}
		@@ -3427,6 +3481,8 @@ static void __net_exit hwsim_exit_net(struct net *net)
		continue;

		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);
		}
		@@ -3463,6 +3519,7 @@ static int __init init_mac80211_hwsim(void)
		hwsim_wq = alloc_workqueue("hwsim_wq",WQ_MEM_RECLAIM,0);
		if (!hwsim_wq)
		return -ENOMEM;
		rhashtable_init(&hwsim_radios_rht, &hwsim_rht_params);

		err = register_pernet_device(&hwsim_net_ops);
		if (err)
		@@ -3604,6 +3661,7 @@ static void __exit exit_mac80211_hwsim(void)
		mac80211_hwsim_free();
		flush_workqueue(hwsim_wq);

		rhashtable_destroy(&hwsim_radios_rht);
		unregister_netdev(hwsim_mon);
		platform_driver_unregister(&mac80211_hwsim_driver);
		unregister_pernet_device(&hwsim_net_ops);

drivers/net/wireless/mac80211_hwsim.h

+67 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,8 @@ enum hwsim_tx_control_flags {
		* @HWSIM_CMD_TX_INFO_FRAME: Transmission info report from user space to
		* kernel, uses:
		* %HWSIM_ATTR_ADDR_TRANSMITTER, %HWSIM_ATTR_FLAGS,
		* %HWSIM_ATTR_TX_INFO, %HWSIM_ATTR_SIGNAL, %HWSIM_ATTR_COOKIE
		* %HWSIM_ATTR_TX_INFO, %WSIM_ATTR_TX_INFO_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
		@@ -123,6 +124,8 @@ enum {
		* @HWSIM_ATTR_RADIO_NAME: Name of radio, e.g. phy666
		* @HWSIM_ATTR_NO_VIF: Do not create vif (wlanX) when creating radio.
		* @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_MAX: enum limit
		*/

		@@ -149,6 +152,7 @@ enum {
		HWSIM_ATTR_NO_VIF,
		HWSIM_ATTR_FREQ,
		HWSIM_ATTR_PAD,
		HWSIM_ATTR_TX_INFO_FLAGS,
		__HWSIM_ATTR_MAX,
		};
		#define HWSIM_ATTR_MAX (__HWSIM_ATTR_MAX - 1)
		@@ -171,4 +175,66 @@ struct hwsim_tx_rate {
		u8 count;
		} __packed;

		/**
		* enum hwsim_tx_rate_flags - per-rate flags set by the rate control algorithm.
		* Inspired by structure mac80211_rate_control_flags. New flags may be
		* appended, but old flags not deleted, to keep compatibility for
		* userspace.
		*
		* These flags are set by the Rate control algorithm for each rate during tx,
		* in the @flags member of struct ieee80211_tx_rate.
		*
		* @MAC80211_HWSIM_TX_RC_USE_RTS_CTS: Use RTS/CTS exchange for this rate.
		* @MAC80211_HWSIM_TX_RC_USE_CTS_PROTECT: CTS-to-self protection is required.
		* This is set if the current BSS requires ERP protection.
		* @MAC80211_HWSIM_TX_RC_USE_SHORT_PREAMBLE: Use short preamble.
		* @MAC80211_HWSIM_TX_RC_MCS: HT rate.
		* @MAC80211_HWSIM_TX_RC_VHT_MCS: VHT MCS rate, in this case the idx field is
		* split into a higher 4 bits (Nss) and lower 4 bits (MCS number)
		* @MAC80211_HWSIM_TX_RC_GREEN_FIELD: Indicates whether this rate should be used
		* in Greenfield mode.
		* @MAC80211_HWSIM_TX_RC_40_MHZ_WIDTH: Indicates if the Channel Width should be
		* 40 MHz.
		* @MAC80211_HWSIM_TX_RC_80_MHZ_WIDTH: Indicates 80 MHz transmission
		* @MAC80211_HWSIM_TX_RC_160_MHZ_WIDTH: Indicates 160 MHz transmission
		* (80+80 isn't supported yet)
		* @MAC80211_HWSIM_TX_RC_DUP_DATA: The frame should be transmitted on both of
		* the adjacent 20 MHz channels, if the current channel type is
		* NL80211_CHAN_HT40MINUS or NL80211_CHAN_HT40PLUS.
		* @MAC80211_HWSIM_TX_RC_SHORT_GI: Short Guard interval should be used for this
		* rate.
		*/
		enum hwsim_tx_rate_flags {
		MAC80211_HWSIM_TX_RC_USE_RTS_CTS = BIT(0),
		MAC80211_HWSIM_TX_RC_USE_CTS_PROTECT = BIT(1),
		MAC80211_HWSIM_TX_RC_USE_SHORT_PREAMBLE = BIT(2),

		/* rate index is an HT/VHT MCS instead of an index */
		MAC80211_HWSIM_TX_RC_MCS = BIT(3),
		MAC80211_HWSIM_TX_RC_GREEN_FIELD = BIT(4),
		MAC80211_HWSIM_TX_RC_40_MHZ_WIDTH = BIT(5),
		MAC80211_HWSIM_TX_RC_DUP_DATA = BIT(6),
		MAC80211_HWSIM_TX_RC_SHORT_GI = BIT(7),
		MAC80211_HWSIM_TX_RC_VHT_MCS = BIT(8),
		MAC80211_HWSIM_TX_RC_80_MHZ_WIDTH = BIT(9),
		MAC80211_HWSIM_TX_RC_160_MHZ_WIDTH = BIT(10),
		};

		/**
		* struct hwsim_tx_rate - rate selection/status
		*
		* @idx: rate index to attempt to send with
		* @count: number of tries in this rate before going to the next rate
		*
		* A value of -1 for @idx indicates an invalid rate and, if used
		* in an array of retry rates, that no more rates should be tried.
		*
		* When used for transmit status reporting, the driver should
		* always report the rate and number of retries used.
		*
		*/
		struct hwsim_tx_rate_flag {
		s8 idx;
		u16 flags;
		} __packed;
		#endif /* __MAC80211_HWSIM_H */

net/mac80211/debugfs_sta.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -420,7 +420,7 @@ static ssize_t sta_vht_capa_read(struct file file, char __user userbuf,
		default:
		p += scnprintf(p, sizeof(buf) + buf - p,
		"\t\tMAX-MPDU-UNKNOWN\n");
		};
		}
		switch (vhtc->cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {
		case 0:
		p += scnprintf(p, sizeof(buf) + buf - p,
		@@ -438,7 +438,7 @@ static ssize_t sta_vht_capa_read(struct file file, char __user userbuf,
		p += scnprintf(p, sizeof(buf) + buf - p,
		"\t\tUNKNOWN-MHZ: 0x%x\n",
		(vhtc->cap >> 2) & 0x3);
		};
		}
		PFLAG(RXLDPC, "RXLDPC");
		PFLAG(SHORT_GI_80, "SHORT-GI-80");
		PFLAG(SHORT_GI_160, "SHORT-GI-160");