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

Merge tag 'mac80211-next-for-davem-2018-08-29' of... 

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



Johannes Berg says:

====================
Only a few changes at this point:
 * new channels in 60 GHz
 * clarify (average) ACK signal reporting API
 * expose ieee80211_send_layer2_update() for all drivers
 * start/stop mac80211's TXQs properly when required
 * avoid regulatory restore with IE ignoring
 * spelling: contidion -> condition
 * fully implement WFA Multi-AP backhaul
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 016f3d18 9c06602b

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

+1 −1
Original line number Diff line number Diff line
@@ -1436,7 +1436,7 @@ static int wil_freq_debugfs_show(struct seq_file *s, void *data) 
{

	struct wil6210_priv *wil = s->private;

	struct wireless_dev *wdev = wil->main_ndev->ieee80211_ptr;

	u16 freq = wdev->chandef.chan ? wdev->chandef.chan->center_freq : 0;

	u32 freq = wdev->chandef.chan ? wdev->chandef.chan->center_freq : 0;



	seq_printf(s, "Freq = %d\n", freq);

include/net/cfg80211.h

+12 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ enum ieee80211_channel_flags { 
 */

struct ieee80211_channel {

	enum nl80211_band band;

	u16 center_freq;

	u32 center_freq;

	u16 hw_value;

	u32 flags;

	int max_antenna_gain;
@@ -4732,6 +4732,17 @@ static inline const u8 *cfg80211_find_ext_ie(u8 ext_eid, const u8 *ies, int len) 
const u8 *cfg80211_find_vendor_ie(unsigned int oui, int oui_type,

				  const u8 *ies, int len);



/**

 * cfg80211_send_layer2_update - send layer 2 update frame

 *

 * @dev: network device

 * @addr: STA MAC address

 *

 * Wireless drivers can use this function to update forwarding tables in bridge

 * devices upon STA association.

 */

void cfg80211_send_layer2_update(struct net_device *dev, const u8 *addr);



/**

 * DOC: Regulatory enforcement infrastructure

 *

include/net/mac80211.h

+4 −0
Original line number Diff line number Diff line
@@ -1504,6 +1504,8 @@ enum ieee80211_vif_flags { 
 * @drv_priv: data area for driver use, will always be aligned to

 *	sizeof(void \*).

 * @txq: the multicast data TX queue (if driver uses the TXQ abstraction)

 * @txqs_stopped: per AC flag to indicate that intermediate TXQs are stopped,

 *	protected by fq->lock.

 */

struct ieee80211_vif {

	enum nl80211_iftype type;
@@ -1528,6 +1530,8 @@ struct ieee80211_vif { 


	unsigned int probe_req_reg;



	bool txqs_stopped[IEEE80211_NUM_ACS];



	/* must be last */

	u8 drv_priv[0] __aligned(sizeof(void *));

};

include/uapi/linux/nl80211.h

+12 −8
Original line number Diff line number Diff line
@@ -3050,8 +3050,7 @@ enum nl80211_sta_bss_param { 
 *	received from the station (u64, usec)

 * @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment

 * @NL80211_STA_INFO_ACK_SIGNAL: signal strength of the last ACK frame(u8, dBm)

 * @NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG: avg signal strength of (data)

 *	ACK frame (s8, dBm)

 * @NL80211_STA_INFO_ACK_SIGNAL_AVG: avg signal strength of ACK frames (s8, dBm)

 * @__NL80211_STA_INFO_AFTER_LAST: internal

 * @NL80211_STA_INFO_MAX: highest possible station info attribute

 */
@@ -3091,13 +3090,17 @@ enum nl80211_sta_info { 
	NL80211_STA_INFO_RX_DURATION,

	NL80211_STA_INFO_PAD,

	NL80211_STA_INFO_ACK_SIGNAL,

	NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG,

	NL80211_STA_INFO_ACK_SIGNAL_AVG,



	/* keep last */

	__NL80211_STA_INFO_AFTER_LAST,

	NL80211_STA_INFO_MAX = __NL80211_STA_INFO_AFTER_LAST - 1

};



/* we renamed this - stay compatible */

#define NL80211_STA_INFO_DATA_ACK_SIGNAL_AVG NL80211_STA_INFO_ACK_SIGNAL_AVG





/**

 * enum nl80211_tid_stats - per TID statistics attributes

 * @__NL80211_TID_STATS_INVALID: attribute number 0 is reserved
@@ -4338,7 +4341,7 @@ enum nl80211_txrate_gi { 
 * enum nl80211_band - Frequency band

 * @NL80211_BAND_2GHZ: 2.4 GHz ISM band

 * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz)

 * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz)

 * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 69.12 GHz)

 * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace

 *	since newer kernel versions may support more bands

 */
@@ -5213,9 +5216,8 @@ enum nl80211_feature_flags { 
 *	"radar detected" event.

 * @NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211: Driver supports sending and

 *	receiving control port frames over nl80211 instead of the netdevice.

 * @NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT: This Driver support data ack

 *	rssi if firmware support, this flag is to intimate about ack rssi

 *	support to nl80211.

 * @NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT: This driver/device supports

 *	(average) ACK signal strength reporting.

 * @NL80211_EXT_FEATURE_TXQS: Driver supports FQ-CoDel-enabled intermediate

 *      TXQs.

 * @NL80211_EXT_FEATURE_SCAN_RANDOM_SN: Driver/device supports randomizing the
@@ -5255,7 +5257,9 @@ enum nl80211_ext_feature_index { 
	NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN,

	NL80211_EXT_FEATURE_DFS_OFFLOAD,

	NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211,

	NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT,

	NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT,

	/* we renamed this - stay compatible */

	NL80211_EXT_FEATURE_DATA_ACK_SIGNAL_SUPPORT = NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT,

	NL80211_EXT_FEATURE_TXQS,

	NL80211_EXT_FEATURE_SCAN_RANDOM_SN,

	NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT,

net/mac80211/cfg.c

+2 −46
Original line number Diff line number Diff line
@@ -1092,50 +1092,6 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) 
	return 0;

}



/* Layer 2 Update frame (802.2 Type 1 LLC XID Update response) */

struct iapp_layer2_update {

	u8 da[ETH_ALEN];	/* broadcast */

	u8 sa[ETH_ALEN];	/* STA addr */

	__be16 len;		/* 6 */

	u8 dsap;		/* 0 */

	u8 ssap;		/* 0 */

	u8 control;

	u8 xid_info[3];

} __packed;



static void ieee80211_send_layer2_update(struct sta_info *sta)

{

	struct iapp_layer2_update *msg;

	struct sk_buff *skb;



	/* Send Level 2 Update Frame to update forwarding tables in layer 2

	 * bridge devices */



	skb = dev_alloc_skb(sizeof(*msg));

	if (!skb)

		return;

	msg = skb_put(skb, sizeof(*msg));



	/* 802.2 Type 1 Logical Link Control (LLC) Exchange Identifier (XID)

	 * Update response frame; IEEE Std 802.2-1998, 5.4.1.2.1 */



	eth_broadcast_addr(msg->da);

	memcpy(msg->sa, sta->sta.addr, ETH_ALEN);

	msg->len = htons(6);

	msg->dsap = 0;

	msg->ssap = 0x01;	/* NULL LSAP, CR Bit: Response */

	msg->control = 0xaf;	/* XID response lsb.1111F101.

				 * F=0 (no poll command; unsolicited frame) */

	msg->xid_info[0] = 0x81;	/* XID format identifier */

	msg->xid_info[1] = 1;	/* LLC types/classes: Type 1 LLC */

	msg->xid_info[2] = 0;	/* XID sender's receive window size (RW) */



	skb->dev = sta->sdata->dev;

	skb->protocol = eth_type_trans(skb, sta->sdata->dev);

	memset(skb->cb, 0, sizeof(skb->cb));

	netif_rx_ni(skb);

}



static int sta_apply_auth_flags(struct ieee80211_local *local,

				struct sta_info *sta,

				u32 mask, u32 set)
@@ -1499,7 +1455,7 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, 
	}



	if (layer2_update)

		ieee80211_send_layer2_update(sta);

		cfg80211_send_layer2_update(sta->sdata->dev, sta->sta.addr);



	rcu_read_unlock();
@@ -1601,7 +1557,7 @@ static int ieee80211_change_station(struct wiphy *wiphy, 
		if (test_sta_flag(sta, WLAN_STA_AUTHORIZED))

			ieee80211_vif_inc_num_mcast(sta->sdata);



		ieee80211_send_layer2_update(sta);

		cfg80211_send_layer2_update(sta->sdata->dev, sta->sta.addr);

	}



	err = sta_apply_parameters(local, sta, params);

CRA Git | Maintained and supported by SUSTech CRA and CCSE