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

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

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

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



Johannes Berg says:

====================
Only a few new things:
 * hwsim net namespace stuff from Kirill Tkhai
 * A-MSDU support in fast-RX
 * 4-addr mode support in fast-RX
 * support for a spec quirk in Add-BA negotiation
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ad0bff05 2e75bb2f

drivers/net/wireless/mac80211_hwsim.c

+9 −6
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static inline void hwsim_clear_chanctx_magic(struct ieee80211_chanctx_conf *c) 


static unsigned int hwsim_net_id;



static int hwsim_netgroup;

static struct ida hwsim_netgroup_ida = IDA_INIT;



struct hwsim_net {

	int netgroup;
@@ -267,11 +267,13 @@ static inline int hwsim_net_get_netgroup(struct net *net) 
	return hwsim_net->netgroup;

}



static inline void hwsim_net_set_netgroup(struct net *net)

static inline int hwsim_net_set_netgroup(struct net *net)

{

	struct hwsim_net *hwsim_net = net_generic(net, hwsim_net_id);



	hwsim_net->netgroup = hwsim_netgroup++;

	hwsim_net->netgroup = ida_simple_get(&hwsim_netgroup_ida,

					     0, 0, GFP_KERNEL);

	return hwsim_net->netgroup >= 0 ? 0 : -ENOMEM;

}



static inline u32 hwsim_net_get_wmediumd(struct net *net)
@@ -3507,9 +3509,7 @@ static int __init hwsim_init_netlink(void) 


static __net_init int hwsim_init_net(struct net *net)

{

	hwsim_net_set_netgroup(net);



	return 0;

	return hwsim_net_set_netgroup(net);

}



static void __net_exit hwsim_exit_net(struct net *net)
@@ -3532,6 +3532,8 @@ static void __net_exit hwsim_exit_net(struct net *net) 
		queue_work(hwsim_wq, &data->destroy_work);

	}

	spin_unlock_bh(&hwsim_radio_lock);



	ida_simple_remove(&hwsim_netgroup_ida, hwsim_net_get_netgroup(net));

}



static struct pernet_operations hwsim_net_ops = {
@@ -3539,6 +3541,7 @@ static struct pernet_operations hwsim_net_ops = { 
	.exit = hwsim_exit_net,

	.id   = &hwsim_net_id,

	.size = sizeof(struct hwsim_net),

	.async = true,

};



static void hwsim_exit_netlink(void)

include/net/cfg80211.h

+4 −2
Original line number Diff line number Diff line
@@ -4410,10 +4410,12 @@ unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr); 
 *	of it being pushed into the SKB

 * @addr: the device MAC address

 * @iftype: the virtual interface type

 * @data_offset: offset of payload after the 802.11 header

 * Return: 0 on success. Non-zero on error.

 */

int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr,

				  const u8 *addr, enum nl80211_iftype iftype);

				  const u8 *addr, enum nl80211_iftype iftype,

				  u8 data_offset);



/**

 * ieee80211_data_to_8023 - convert an 802.11 data frame to 802.3
@@ -4425,7 +4427,7 @@ int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr, 
static inline int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,

					 enum nl80211_iftype iftype)

{

	return ieee80211_data_to_8023_exthdr(skb, NULL, addr, iftype);

	return ieee80211_data_to_8023_exthdr(skb, NULL, addr, iftype, 0);

}



/**

net/mac80211/agg-rx.c

+12 −2
Original line number Diff line number Diff line
@@ -298,13 +298,23 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta, 


	if (test_bit(tid, sta->ampdu_mlme.agg_session_valid)) {

		if (sta->ampdu_mlme.tid_rx_token[tid] == dialog_token) {

			struct tid_ampdu_rx *tid_rx;



			ht_dbg_ratelimited(sta->sdata,

					   "updated AddBA Req from %pM on tid %u\n",

					   sta->sta.addr, tid);

			/* We have no API to update the timeout value in the

			 * driver so reject the timeout update.

			 * driver so reject the timeout update if the timeout

			 * changed. If if did not change, i.e., no real update,

			 * just reply with success.

			 */

			rcu_read_lock();

			tid_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[tid]);

			if (tid_rx && tid_rx->timeout == timeout)

				status = WLAN_STATUS_SUCCESS;

			else

				status = WLAN_STATUS_REQUEST_DECLINED;

			rcu_read_unlock();

			goto end;

		}

net/mac80211/cfg.c

+1 −0
Original line number Diff line number Diff line
@@ -2685,6 +2685,7 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, 


	ieee80211_recalc_ps(local);

	ieee80211_recalc_ps_vif(sdata);

	ieee80211_check_fast_rx_iface(sdata);



	return 0;

}

net/mac80211/rx.c

+99 −60
Original line number Diff line number Diff line
@@ -2353,39 +2353,17 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx) 
}



static ieee80211_rx_result debug_noinline

ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)

__ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx, u8 data_offset)

{

	struct net_device *dev = rx->sdata->dev;

	struct sk_buff *skb = rx->skb;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	__le16 fc = hdr->frame_control;

	struct sk_buff_head frame_list;

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb);

	struct ethhdr ethhdr;

	const u8 *check_da = ethhdr.h_dest, *check_sa = ethhdr.h_source;



	if (unlikely(!ieee80211_is_data(fc)))

		return RX_CONTINUE;



	if (unlikely(!ieee80211_is_data_present(fc)))

		return RX_DROP_MONITOR;



	if (!(status->rx_flags & IEEE80211_RX_AMSDU))

		return RX_CONTINUE;



	if (unlikely(ieee80211_has_a4(hdr->frame_control))) {

		switch (rx->sdata->vif.type) {

		case NL80211_IFTYPE_AP_VLAN:

			if (!rx->sdata->u.vlan.sta)

				return RX_DROP_UNUSABLE;

			break;

		case NL80211_IFTYPE_STATION:

			if (!rx->sdata->u.mgd.use_4addr)

				return RX_DROP_UNUSABLE;

			break;

		default:

			return RX_DROP_UNUSABLE;

		}

		check_da = NULL;

		check_sa = NULL;

	} else switch (rx->sdata->vif.type) {
@@ -2405,15 +2383,13 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx) 
			break;

	}



	if (is_multicast_ether_addr(hdr->addr1))

		return RX_DROP_UNUSABLE;



	skb->dev = dev;

	__skb_queue_head_init(&frame_list);



	if (ieee80211_data_to_8023_exthdr(skb, &ethhdr,

					  rx->sdata->vif.addr,

					  rx->sdata->vif.type))

					  rx->sdata->vif.type,

					  data_offset))

		return RX_DROP_UNUSABLE;



	ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr,
@@ -2435,6 +2411,44 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx) 
	return RX_QUEUED;

}



static ieee80211_rx_result debug_noinline

ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)

{

	struct sk_buff *skb = rx->skb;

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	__le16 fc = hdr->frame_control;



	if (!(status->rx_flags & IEEE80211_RX_AMSDU))

		return RX_CONTINUE;



	if (unlikely(!ieee80211_is_data(fc)))

		return RX_CONTINUE;



	if (unlikely(!ieee80211_is_data_present(fc)))

		return RX_DROP_MONITOR;



	if (unlikely(ieee80211_has_a4(hdr->frame_control))) {

		switch (rx->sdata->vif.type) {

		case NL80211_IFTYPE_AP_VLAN:

			if (!rx->sdata->u.vlan.sta)

				return RX_DROP_UNUSABLE;

			break;

		case NL80211_IFTYPE_STATION:

			if (!rx->sdata->u.mgd.use_4addr)

				return RX_DROP_UNUSABLE;

			break;

		default:

			return RX_DROP_UNUSABLE;

		}

	}



	if (is_multicast_ether_addr(hdr->addr1))

		return RX_DROP_UNUSABLE;



	return __ieee80211_rx_h_amsdu(rx, 0);

}



#ifdef CONFIG_MAC80211_MESH

static ieee80211_rx_result

ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
@@ -3747,15 +3761,6 @@ void ieee80211_check_fast_rx(struct sta_info *sta) 


	switch (sdata->vif.type) {

	case NL80211_IFTYPE_STATION:

		/* 4-addr is harder to deal with, later maybe */

		if (sdata->u.mgd.use_4addr)

			goto clear;

		/* software powersave is a huge mess, avoid all of it */

		if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK))

			goto clear;

		if (ieee80211_hw_check(&local->hw, SUPPORTS_PS) &&

		    !ieee80211_hw_check(&local->hw, SUPPORTS_DYNAMIC_PS))

			goto clear;

		if (sta->sta.tdls) {

			fastrx.da_offs = offsetof(struct ieee80211_hdr, addr1);

			fastrx.sa_offs = offsetof(struct ieee80211_hdr, addr2);
@@ -3767,6 +3772,23 @@ void ieee80211_check_fast_rx(struct sta_info *sta) 
			fastrx.expected_ds_bits =

				cpu_to_le16(IEEE80211_FCTL_FROMDS);

		}



		if (sdata->u.mgd.use_4addr && !sta->sta.tdls) {

			fastrx.expected_ds_bits |=

				cpu_to_le16(IEEE80211_FCTL_TODS);

			fastrx.da_offs = offsetof(struct ieee80211_hdr, addr3);

			fastrx.sa_offs = offsetof(struct ieee80211_hdr, addr4);

		}



		if (!sdata->u.mgd.powersave)

			break;



		/* software powersave is a huge mess, avoid all of it */

		if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK))

			goto clear;

		if (ieee80211_hw_check(&local->hw, SUPPORTS_PS) &&

		    !ieee80211_hw_check(&local->hw, SUPPORTS_DYNAMIC_PS))

			goto clear;

		break;

	case NL80211_IFTYPE_AP_VLAN:

	case NL80211_IFTYPE_AP:
@@ -3783,6 +3805,15 @@ void ieee80211_check_fast_rx(struct sta_info *sta) 
			!(sdata->flags & IEEE80211_SDATA_DONT_BRIDGE_PACKETS) &&

			(sdata->vif.type != NL80211_IFTYPE_AP_VLAN ||

			 !sdata->u.vlan.sta);



		if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&

		    sdata->u.vlan.sta) {

			fastrx.expected_ds_bits |=

				cpu_to_le16(IEEE80211_FCTL_FROMDS);

			fastrx.sa_offs = offsetof(struct ieee80211_hdr, addr4);

			fastrx.internal_forward = 0;

		}



		break;

	default:

		goto clear;
@@ -3881,7 +3912,8 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, 
	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);

	struct sta_info *sta = rx->sta;

	int orig_len = skb->len;

	int snap_offs = ieee80211_hdrlen(hdr->frame_control);

	int hdrlen = ieee80211_hdrlen(hdr->frame_control);

	int snap_offs = hdrlen;

	struct {

		u8 snap[sizeof(rfc1042_header)];

		__be16 proto;
@@ -3912,10 +3944,6 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, 
	    (status->flag & FAST_RX_CRYPT_FLAGS) != FAST_RX_CRYPT_FLAGS)

		return false;



	/* we don't deal with A-MSDU deaggregation here */

	if (status->rx_flags & IEEE80211_RX_AMSDU)

		return false;



	if (unlikely(!ieee80211_is_data_present(hdr->frame_control)))

		return false;
@@ -3947,8 +3975,10 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, 
		snap_offs += IEEE80211_CCMP_HDR_LEN;

	}



	if (!(status->rx_flags & IEEE80211_RX_AMSDU)) {

		if (!pskb_may_pull(skb, snap_offs + sizeof(*payload)))

			goto drop;



		payload = (void *)(skb->data + snap_offs);



		if (!ether_addr_equal(payload->snap, fast_rx->rfc1042_hdr))
@@ -3962,6 +3992,7 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, 
		if (unlikely(payload->proto == cpu_to_be16(ETH_P_TDLS) ||

			     payload->proto == fast_rx->control_port_protocol))

			return false;

	}



	/* after this point, don't punt to the slowpath! */
@@ -3975,12 +4006,6 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, 
	}



	/* statistics part of ieee80211_rx_h_sta_process() */

	stats->last_rx = jiffies;

	stats->last_rate = sta_stats_encode_rate(status);



	stats->fragments++;

	stats->packets++;



	if (!(status->flag & RX_FLAG_NO_SIGNAL_VAL)) {

		stats->last_signal = status->signal;

		if (!fast_rx->uses_rss)
@@ -4009,6 +4034,20 @@ static bool ieee80211_invoke_fast_rx(struct ieee80211_rx_data *rx, 
	if (rx->key && !ieee80211_has_protected(hdr->frame_control))

		goto drop;



	if (status->rx_flags & IEEE80211_RX_AMSDU) {

		if (__ieee80211_rx_h_amsdu(rx, snap_offs - hdrlen) !=

		    RX_QUEUED)

			goto drop;



		return true;

	}



	stats->last_rx = jiffies;

	stats->last_rate = sta_stats_encode_rate(status);



	stats->fragments++;

	stats->packets++;



	/* do the header conversion - first grab the addresses */

	ether_addr_copy(addrs.da, skb->data + fast_rx->da_offs);

	ether_addr_copy(addrs.sa, skb->data + fast_rx->sa_offs);