diff mbox series

[1/2] mac80211: add receive path for ethernet frame format

Message ID 1591763456-23275-2-git-send-email-srirrama@codeaurora.org (mailing list archive)
State Changes Requested
Delegated to: Johannes Berg
Headers show
Series mac80211: add 802.11 decapsulation offload support | expand

Commit Message

Sriram R June 10, 2020, 4:30 a.m. UTC
Implement rx path which does fewer processing on the received data
frame which has already gone through 802.11 header decapsulation
and other functionalities which require 802.11 header in the low
level driver or hardware. Currently this rx path is restricted
to AP and STA mode, but can be extended for Adhoc mode as well.

It is upto to the low level driver to invoke the correct API and
make sure if the frame that it passes is in ethernet format and
the sta pointer is valid.

Co-developed-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
Co-developed-by: Vasanthakumar Thiagarajan <vthiagar@codeaurora.org>
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@codeaurora.org>
Signed-off-by: Sriram R <srirrama@codeaurora.org>
---
 include/net/mac80211.h |  20 +++++
 net/mac80211/rx.c      | 222 +++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 237 insertions(+), 5 deletions(-)

Comments

Johannes Berg Aug. 3, 2020, 10:06 a.m. UTC | #1
Hi,

sorry for the delay.

> +static const u8 pae_group_addr[ETH_ALEN] __aligned(2) = {0x01, 0x80, 0xC2, 0x00,
> +							 0x00, 0x03};

Why the strange line breaking, and not preserve like it was:

>  static bool ieee80211_frame_allowed(struct ieee80211_rx_data *rx, __le16 fc)
>  {
> -	static const u8 pae_group_addr[ETH_ALEN] __aligned(2)
> -		= { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x03 };
>  	struct ethhdr *ehdr = (struct ethhdr *) rx->skb->data;


> @@ -2582,9 +2584,12 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
>  		 * for non-QoS-data frames. Here we know it's a data
>  		 * frame, so count MSDUs.
>  		 */
> -		u64_stats_update_begin(&rx->sta->rx_stats.syncp);
> -		rx->sta->rx_stats.msdu[rx->seqno_idx]++;
> -		u64_stats_update_end(&rx->sta->rx_stats.syncp);
> +		rx_stats = &rx->sta->rx_stats;
> +		if (ieee80211_hw_check(&rx->local->hw, USES_RSS))
> +			rx_stats = this_cpu_ptr(rx->sta->pcpu_rx_stats);
> +		u64_stats_update_begin(&rx_stats->syncp);
> +		rx_stats->msdu[rx->seqno_idx]++;
> +		u64_stats_update_end(&rx_stats->syncp);
>  	}

This seems like an unrelated fix?

> +	if (ieee80211_hw_check(&local->hw, USES_RSS))
> +		stats = this_cpu_ptr(sta->pcpu_rx_stats);
> +
> +	/* TODO: Extend ieee80211_rx_8023() with bssid so that Ethernet
> +	 * encap/decap can be supported in Adhoc interface type as well.
> +	 * Adhoc interface depends on bssid to update last_rx.

What would the plan for this be? And I guess by that I mostly mean
"where's the space for it"? In a function argument?

Any reason not to do this from the start, to avoid having to change the
API again later? Though I guess the bssid argument could then be allowed
to be NULL for the modes listed:

> +	if (vif->type != NL80211_IFTYPE_STATION &&
> +	    vif->type != NL80211_IFTYPE_AP_VLAN &&
> +	    vif->type != NL80211_IFTYPE_AP)
> +		goto drop;


> +
> +	if (unlikely(!test_sta_flag(sta, WLAN_STA_AUTHORIZED))) {
> +		if (ehdr->h_proto != sdata->control_port_protocol)
> +			goto drop;
> +		else if (!ether_addr_equal(ehdr->h_dest, vif->addr) &&
> +			 !ether_addr_equal(ehdr->h_dest, pae_group_addr))
> +			goto drop;
> +	}

Maybe refactor ieee80211_frame_allowed() a bit? This is basically the
same as the first condition in there, after all. Then you'd also not
have to pull pae_group_addr to the file scope.

> +	if (status->flag & RX_FLAG_80211_MCAST) {
> +		for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
> +			key = rcu_dereference(sta->gtk[i]);
> +			if (key)
> +				break;

What? This doesn't seem right at all.

Either you cannot support multiple GTKs (umm?) or you should probably
have the right one somehow? Or maybe you don't need to do anything per
key?

> +		}
> +	} else {
> +		key = rcu_dereference(sta->ptk[sta->ptk_idx]);
> +	}
> +
> +	if (key && unlikely(key->flags & KEY_FLAG_TAINTED))
> +		goto drop;
> +
> +	if (status->flag & RX_FLAG_MMIC_ERROR) {
> +		if (key)
> +			key->u.tkip.mic_failures++;
> +		goto mic_fail;
> +	}

But then you do per-key things.

> +	if (!(status->flag & RX_FLAG_DUP_VALIDATED))
> +		goto drop;
> +
> +	I802_DEBUG_INC(local->dot11ReceivedFragmentCount);
> +
> +	if (!(status->flag & RX_FLAG_80211_MCAST)) {
> +		stats->last_rx = jiffies;
> +		stats->last_rate = sta_stats_encode_rate(status);
> +	}
> +
> +	if (sdata->vif.type == NL80211_IFTYPE_STATION &&
> +	    !(status->flag & RX_FLAG_80211_MCAST))
> +		ieee80211_sta_reset_conn_monitor(sdata);
> +
> +	u64_stats_update_begin(&stats->syncp);
> +	stats->fragments++;
> +	stats->packets++;

fragments and packets don't need the begin/end, do they?

> +	stats->bytes += skb->len;
> +	u64_stats_update_end(&stats->syncp);
> +
> +	if (!(status->flag & RX_FLAG_NO_SIGNAL_VAL)) {
> +		stats->last_signal = status->signal;
> +		if (!ieee80211_hw_check(&local->hw, USES_RSS))
> +			ewma_signal_add(&sta->rx_stats_avg.signal,
> +					-status->signal);
> +	}
> +
> +	if (status->chains) {
> +		stats->chains = status->chains;
> +		for (i = 0; i < ARRAY_SIZE(status->chain_signal); i++) {
> +			int signal = status->chain_signal[i];
> +
> +			if (!(status->chains & BIT(i)))
> +				continue;
> +
> +			stats->chain_signal_last[i] = signal;
> +			if (!ieee80211_hw_check(&local->hw, USES_RSS))
> +				ewma_signal_add(&sta->rx_stats_avg.chain_signal[i],
> +						-signal);
> +		}
> +	}

This seems very duplicated - can you refactor it?

> +	if (unlikely(ehdr->h_proto == cpu_to_be16(ETH_P_TDLS))) {
> +		struct ieee80211_tdls_data *tf = (void *)skb->data;
> +
> +		if (pskb_may_pull(skb,
> +				  offsetof(struct ieee80211_tdls_data, u)) &&
> +		    tf->payload_type == WLAN_TDLS_SNAP_RFTYPE &&
> +		    tf->category == WLAN_CATEGORY_TDLS &&
> +		    (tf->action_code == WLAN_TDLS_CHANNEL_SWITCH_REQUEST ||
> +		     tf->action_code == WLAN_TDLS_CHANNEL_SWITCH_RESPONSE)) {
> +			skb_queue_tail(&local->skb_queue_tdls_chsw, skb);
> +			schedule_work(&local->tdls_chsw_work);
> +			return;
> +		}
> +	}

same here.

Ultimately, it seems that the parts of the RX path _after_ conversion
really ought to be the same between the normal and offloaded conversion?
So why wouldn't those be (essentially) the same code?

> +	/* FIXME: Since rx.seqno_idx is not available for decap offloaded frames
> +	 * rx msdu stats update at the seqno_idx in ieee80211_deliver_skb()
> +	 * will always be updated at index 0 and will not be very useful.
> +	 */
> +	ieee80211_deliver_skb(&rx);

That's an issue. You should either fix that or prevent the bad counters
being shown to userspace - IMHO lack of stats is better than broken
stats.

johannes
Sriram R Aug. 3, 2020, 10:44 a.m. UTC | #2
Hi,
On 2020-08-03 15:36, Johannes Berg wrote:
> Hi,
> 
> sorry for the delay.
> 
>> +static const u8 pae_group_addr[ETH_ALEN] __aligned(2) = {0x01, 0x80, 
>> 0xC2, 0x00,
>> +							 0x00, 0x03};
> 
> Why the strange line breaking, and not preserve like it was:
I'll fix in next revision.
> 
>>  static bool ieee80211_frame_allowed(struct ieee80211_rx_data *rx, 
>> __le16 fc)
>>  {
>> -	static const u8 pae_group_addr[ETH_ALEN] __aligned(2)
>> -		= { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x03 };
>>  	struct ethhdr *ehdr = (struct ethhdr *) rx->skb->data;
> 
> 
>> @@ -2582,9 +2584,12 @@ ieee80211_deliver_skb(struct ieee80211_rx_data 
>> *rx)
>>  		 * for non-QoS-data frames. Here we know it's a data
>>  		 * frame, so count MSDUs.
>>  		 */
>> -		u64_stats_update_begin(&rx->sta->rx_stats.syncp);
>> -		rx->sta->rx_stats.msdu[rx->seqno_idx]++;
>> -		u64_stats_update_end(&rx->sta->rx_stats.syncp);
>> +		rx_stats = &rx->sta->rx_stats;
>> +		if (ieee80211_hw_check(&rx->local->hw, USES_RSS))
>> +			rx_stats = this_cpu_ptr(rx->sta->pcpu_rx_stats);
>> +		u64_stats_update_begin(&rx_stats->syncp);
>> +		rx_stats->msdu[rx->seqno_idx]++;
>> +		u64_stats_update_end(&rx_stats->syncp);
>>  	}
> 
> This seems like an unrelated fix?
Yes, I'll move this separately.
> 
>> +	if (ieee80211_hw_check(&local->hw, USES_RSS))
>> +		stats = this_cpu_ptr(sta->pcpu_rx_stats);
>> +
>> +	/* TODO: Extend ieee80211_rx_8023() with bssid so that Ethernet
>> +	 * encap/decap can be supported in Adhoc interface type as well.
>> +	 * Adhoc interface depends on bssid to update last_rx.
> 
> What would the plan for this be? And I guess by that I mostly mean
> "where's the space for it"? In a function argument?
> 
> Any reason not to do this from the start, to avoid having to change the
> API again later? Though I guess the bssid argument could then be 
> allowed
> to be NULL for the modes listed:
Sure, i'll extend the api in next revision.
> 
>> +	if (vif->type != NL80211_IFTYPE_STATION &&
>> +	    vif->type != NL80211_IFTYPE_AP_VLAN &&
>> +	    vif->type != NL80211_IFTYPE_AP)
>> +		goto drop;
> 
> 
>> +
>> +	if (unlikely(!test_sta_flag(sta, WLAN_STA_AUTHORIZED))) {
>> +		if (ehdr->h_proto != sdata->control_port_protocol)
>> +			goto drop;
>> +		else if (!ether_addr_equal(ehdr->h_dest, vif->addr) &&
>> +			 !ether_addr_equal(ehdr->h_dest, pae_group_addr))
>> +			goto drop;
>> +	}
> 
> Maybe refactor ieee80211_frame_allowed() a bit? This is basically the
> same as the first condition in there, after all. Then you'd also not
> have to pull pae_group_addr to the file scope.
> 
Sure. I'll refactor this and similar duplicate code below in next 
revision.
>> +	if (status->flag & RX_FLAG_80211_MCAST) {
>> +		for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
>> +			key = rcu_dereference(sta->gtk[i]);
>> +			if (key)
>> +				break;
> 
> What? This doesn't seem right at all.
I'll update ieee80211_rx_8023() to get some meta data of the received 
packet
such as key id and tid from the driver, so that this key id selection 
and
  tid stats issue pointed below is also resolved.
> 
> Either you cannot support multiple GTKs (umm?) or you should probably
> have the right one somehow? Or maybe you don't need to do anything per
> key?
> 
>> +		}
>> +	} else {
>> +		key = rcu_dereference(sta->ptk[sta->ptk_idx]);
>> +	}
>> +
>> +	if (key && unlikely(key->flags & KEY_FLAG_TAINTED))
>> +		goto drop;
>> +
>> +	if (status->flag & RX_FLAG_MMIC_ERROR) {
>> +		if (key)
>> +			key->u.tkip.mic_failures++;
>> +		goto mic_fail;
>> +	}
> 
> But then you do per-key things.
> 
>> +	if (!(status->flag & RX_FLAG_DUP_VALIDATED))
>> +		goto drop;
>> +
>> +	I802_DEBUG_INC(local->dot11ReceivedFragmentCount);
>> +
>> +	if (!(status->flag & RX_FLAG_80211_MCAST)) {
>> +		stats->last_rx = jiffies;
>> +		stats->last_rate = sta_stats_encode_rate(status);
>> +	}
>> +
>> +	if (sdata->vif.type == NL80211_IFTYPE_STATION &&
>> +	    !(status->flag & RX_FLAG_80211_MCAST))
>> +		ieee80211_sta_reset_conn_monitor(sdata);
>> +
>> +	u64_stats_update_begin(&stats->syncp);
>> +	stats->fragments++;
>> +	stats->packets++;
> 
> fragments and packets don't need the begin/end, do they?
I'll remove it.
> 
>> +	stats->bytes += skb->len;
>> +	u64_stats_update_end(&stats->syncp);
>> +
>> +	if (!(status->flag & RX_FLAG_NO_SIGNAL_VAL)) {
>> +		stats->last_signal = status->signal;
>> +		if (!ieee80211_hw_check(&local->hw, USES_RSS))
>> +			ewma_signal_add(&sta->rx_stats_avg.signal,
>> +					-status->signal);
>> +	}
>> +
>> +	if (status->chains) {
>> +		stats->chains = status->chains;
>> +		for (i = 0; i < ARRAY_SIZE(status->chain_signal); i++) {
>> +			int signal = status->chain_signal[i];
>> +
>> +			if (!(status->chains & BIT(i)))
>> +				continue;
>> +
>> +			stats->chain_signal_last[i] = signal;
>> +			if (!ieee80211_hw_check(&local->hw, USES_RSS))
>> +				ewma_signal_add(&sta->rx_stats_avg.chain_signal[i],
>> +						-signal);
>> +		}
>> +	}
> 
> This seems very duplicated - can you refactor it?
Sure.
> 
>> +	if (unlikely(ehdr->h_proto == cpu_to_be16(ETH_P_TDLS))) {
>> +		struct ieee80211_tdls_data *tf = (void *)skb->data;
>> +
>> +		if (pskb_may_pull(skb,
>> +				  offsetof(struct ieee80211_tdls_data, u)) &&
>> +		    tf->payload_type == WLAN_TDLS_SNAP_RFTYPE &&
>> +		    tf->category == WLAN_CATEGORY_TDLS &&
>> +		    (tf->action_code == WLAN_TDLS_CHANNEL_SWITCH_REQUEST ||
>> +		     tf->action_code == WLAN_TDLS_CHANNEL_SWITCH_RESPONSE)) {
>> +			skb_queue_tail(&local->skb_queue_tdls_chsw, skb);
>> +			schedule_work(&local->tdls_chsw_work);
>> +			return;
>> +		}
>> +	}
> 
> same here.
> 
> Ultimately, it seems that the parts of the RX path _after_ conversion
> really ought to be the same between the normal and offloaded 
> conversion?
> So why wouldn't those be (essentially) the same code?
Yes, i'll remove these duplicate code in next revision.
> 
>> +	/* FIXME: Since rx.seqno_idx is not available for decap offloaded 
>> frames
>> +	 * rx msdu stats update at the seqno_idx in ieee80211_deliver_skb()
>> +	 * will always be updated at index 0 and will not be very useful.
>> +	 */
>> +	ieee80211_deliver_skb(&rx);
> 
> That's an issue. You should either fix that or prevent the bad counters
> being shown to userspace - IMHO lack of stats is better than broken
> stats.
As mentioned, we can extend the api to allow the driver to pass tid as 
part of rx metadata and have the
stats updated.

Thanks for review.

Regards,
Sriram.R
> 
> johannes
diff mbox series

Patch

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 7cb7124..9233a3b 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1258,6 +1258,9 @@  ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
  *	the "0-length PSDU" field included there.  The value for it is
  *	in &struct ieee80211_rx_status.  Note that if this value isn't
  *	known the frame shouldn't be reported.
+ * @RX_FLAG_80211_MCAST: If the receiver address (addr1) in the frame is
+ *	multicast. This is used with the data frames by the drivers
+ *	supporting 802.11 hdr decap offload.
  */
 enum mac80211_rx_flags {
 	RX_FLAG_MMIC_ERROR		= BIT(0),
@@ -1290,6 +1293,7 @@  enum mac80211_rx_flags {
 	RX_FLAG_RADIOTAP_HE_MU		= BIT(27),
 	RX_FLAG_RADIOTAP_LSIG		= BIT(28),
 	RX_FLAG_NO_PSDU			= BIT(29),
+	RX_FLAG_80211_MCAST		= BIT(30),
 };
 
 /**
@@ -4442,6 +4446,22 @@  static inline void ieee80211_rx_ni(struct ieee80211_hw *hw,
 }
 
 /**
+ * ieee80211_rx_8023 - Receive frames in 802.11 decapsulated format
+ *
+ * Low level driver capable of 802.11 header decap uses this function. The frame
+ * will be in ethernet format.
+ * This function may not be called in IRQ context. Calls to this function
+ * for a single hardware must be synchronized against each other.
+ *
+ * @hw: the hardware this frame came in on
+ * @sta : the station the frame was received from, must not be %NULL
+ * @skb: the buffer to receive, owned by mac80211 after this call
+ * @napi: the NAPI context
+ */
+void ieee80211_rx_8023(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
+		       struct sk_buff *skb, struct napi_struct *napi);
+
+/**
  * ieee80211_sta_ps_transition - PS transition for connected sta
  *
  * When operating in AP mode with the %IEEE80211_HW_AP_LINK_PS
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 21854a61..d07281c 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2508,13 +2508,14 @@  __ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
 	return 0;
 }
 
+static const u8 pae_group_addr[ETH_ALEN] __aligned(2) = {0x01, 0x80, 0xC2, 0x00,
+							 0x00, 0x03};
+
 /*
  * requires that rx->skb is a frame with ethernet header
  */
 static bool ieee80211_frame_allowed(struct ieee80211_rx_data *rx, __le16 fc)
 {
-	static const u8 pae_group_addr[ETH_ALEN] __aligned(2)
-		= { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x03 };
 	struct ethhdr *ehdr = (struct ethhdr *) rx->skb->data;
 
 	/*
@@ -2570,6 +2571,7 @@  ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 	struct sk_buff *skb, *xmit_skb;
 	struct ethhdr *ehdr = (struct ethhdr *) rx->skb->data;
 	struct sta_info *dsta;
+	struct ieee80211_sta_rx_stats *rx_stats;
 
 	skb = rx->skb;
 	xmit_skb = NULL;
@@ -2582,9 +2584,12 @@  ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 		 * for non-QoS-data frames. Here we know it's a data
 		 * frame, so count MSDUs.
 		 */
-		u64_stats_update_begin(&rx->sta->rx_stats.syncp);
-		rx->sta->rx_stats.msdu[rx->seqno_idx]++;
-		u64_stats_update_end(&rx->sta->rx_stats.syncp);
+		rx_stats = &rx->sta->rx_stats;
+		if (ieee80211_hw_check(&rx->local->hw, USES_RSS))
+			rx_stats = this_cpu_ptr(rx->sta->pcpu_rx_stats);
+		u64_stats_update_begin(&rx_stats->syncp);
+		rx_stats->msdu[rx->seqno_idx]++;
+		u64_stats_update_end(&rx_stats->syncp);
 	}
 
 	if ((sdata->vif.type == NL80211_IFTYPE_AP ||
@@ -4782,3 +4787,210 @@  void ieee80211_rx_irqsafe(struct ieee80211_hw *hw, struct sk_buff *skb)
 	tasklet_schedule(&local->tasklet);
 }
 EXPORT_SYMBOL(ieee80211_rx_irqsafe);
+
+/* Receive path for 80211 header decap offloaded data frames */
+
+static void
+ieee80211_rx_handle_8023(struct ieee80211_sub_if_data *sdata,
+			 struct sta_info *sta, struct sk_buff *skb,
+			 struct napi_struct *napi)
+{
+	struct ieee80211_local *local = sdata->local;
+	struct ieee80211_vif *vif = &sdata->vif;
+	struct net_device *dev = sdata->dev;
+	struct ieee80211_rx_status *status;
+	struct ieee80211_key *key = NULL;
+	struct ieee80211_rx_data rx;
+	int i;
+	struct ethhdr *ehdr;
+	struct ieee80211_sta_rx_stats *stats = &sta->rx_stats;
+	struct ieee80211_supported_band *sband;
+
+	ehdr = (struct ethhdr *)skb->data;
+	status = IEEE80211_SKB_RXCB(skb);
+
+	if (WARN_ON(status->band >= NUM_NL80211_BANDS))
+		goto drop;
+
+	sband = local->hw.wiphy->bands[status->band];
+	if (WARN_ON(!sband))
+		goto drop;
+
+	if (ieee80211_hw_check(&local->hw, USES_RSS))
+		stats = this_cpu_ptr(sta->pcpu_rx_stats);
+
+	/* TODO: Extend ieee80211_rx_8023() with bssid so that Ethernet
+	 * encap/decap can be supported in Adhoc interface type as well.
+	 * Adhoc interface depends on bssid to update last_rx.
+	 */
+	if (vif->type != NL80211_IFTYPE_STATION &&
+	    vif->type != NL80211_IFTYPE_AP_VLAN &&
+	    vif->type != NL80211_IFTYPE_AP)
+		goto drop;
+
+	if (unlikely(!test_sta_flag(sta, WLAN_STA_AUTHORIZED))) {
+		if (ehdr->h_proto != sdata->control_port_protocol)
+			goto drop;
+		else if (!ether_addr_equal(ehdr->h_dest, vif->addr) &&
+			 !ether_addr_equal(ehdr->h_dest, pae_group_addr))
+			goto drop;
+	}
+
+	if (status->flag & RX_FLAG_80211_MCAST) {
+		for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
+			key = rcu_dereference(sta->gtk[i]);
+			if (key)
+				break;
+		}
+	} else {
+		key = rcu_dereference(sta->ptk[sta->ptk_idx]);
+	}
+
+	if (key && unlikely(key->flags & KEY_FLAG_TAINTED))
+		goto drop;
+
+	if (status->flag & RX_FLAG_MMIC_ERROR) {
+		if (key)
+			key->u.tkip.mic_failures++;
+		goto mic_fail;
+	}
+
+#define ETH_RX_CRYPT_FLAGS	(RX_FLAG_PN_VALIDATED | RX_FLAG_DECRYPTED)
+
+	if (key && (status->flag & ETH_RX_CRYPT_FLAGS) != ETH_RX_CRYPT_FLAGS)
+		goto drop;
+
+	if (!(status->flag & RX_FLAG_DUP_VALIDATED))
+		goto drop;
+
+	I802_DEBUG_INC(local->dot11ReceivedFragmentCount);
+
+	if (!(status->flag & RX_FLAG_80211_MCAST)) {
+		stats->last_rx = jiffies;
+		stats->last_rate = sta_stats_encode_rate(status);
+	}
+
+	if (sdata->vif.type == NL80211_IFTYPE_STATION &&
+	    !(status->flag & RX_FLAG_80211_MCAST))
+		ieee80211_sta_reset_conn_monitor(sdata);
+
+	u64_stats_update_begin(&stats->syncp);
+	stats->fragments++;
+	stats->packets++;
+	stats->bytes += skb->len;
+	u64_stats_update_end(&stats->syncp);
+
+	if (!(status->flag & RX_FLAG_NO_SIGNAL_VAL)) {
+		stats->last_signal = status->signal;
+		if (!ieee80211_hw_check(&local->hw, USES_RSS))
+			ewma_signal_add(&sta->rx_stats_avg.signal,
+					-status->signal);
+	}
+
+	if (status->chains) {
+		stats->chains = status->chains;
+		for (i = 0; i < ARRAY_SIZE(status->chain_signal); i++) {
+			int signal = status->chain_signal[i];
+
+			if (!(status->chains & BIT(i)))
+				continue;
+
+			stats->chain_signal_last[i] = signal;
+			if (!ieee80211_hw_check(&local->hw, USES_RSS))
+				ewma_signal_add(&sta->rx_stats_avg.chain_signal[i],
+						-signal);
+		}
+	}
+
+	if (unlikely(ehdr->h_proto == cpu_to_be16(ETH_P_TDLS))) {
+		struct ieee80211_tdls_data *tf = (void *)skb->data;
+
+		if (pskb_may_pull(skb,
+				  offsetof(struct ieee80211_tdls_data, u)) &&
+		    tf->payload_type == WLAN_TDLS_SNAP_RFTYPE &&
+		    tf->category == WLAN_CATEGORY_TDLS &&
+		    (tf->action_code == WLAN_TDLS_CHANNEL_SWITCH_REQUEST ||
+		     tf->action_code == WLAN_TDLS_CHANNEL_SWITCH_RESPONSE)) {
+			skb_queue_tail(&local->skb_queue_tdls_chsw, skb);
+			schedule_work(&local->tdls_chsw_work);
+			return;
+		}
+	}
+
+	memset(&rx, 0, sizeof(rx));
+	rx.skb = skb;
+	rx.sdata = sdata;
+	rx.local = local;
+	rx.sta = sta;
+	rx.napi = napi;
+
+	if (vif->type == NL80211_IFTYPE_AP_VLAN && sdata->bss &&
+	    unlikely(ehdr->h_proto == sdata->control_port_protocol)) {
+		sdata = container_of(sdata->bss, struct ieee80211_sub_if_data,
+				     u.ap);
+		dev = sdata->dev;
+		rx.sdata = sdata;
+	}
+
+	rx.skb->dev = dev;
+
+	/* FIXME: Since rx.seqno_idx is not available for decap offloaded frames
+	 * rx msdu stats update at the seqno_idx in ieee80211_deliver_skb()
+	 * will always be updated at index 0 and will not be very useful.
+	 */
+	ieee80211_deliver_skb(&rx);
+
+	return;
+
+mic_fail:
+
+	cfg80211_michael_mic_failure(sdata->dev, sta->addr,
+				     is_multicast_ether_addr(ehdr->h_dest) ?
+				     NL80211_KEYTYPE_GROUP :
+				     NL80211_KEYTYPE_PAIRWISE,
+				     key ? key->conf.keyidx : -1,
+				     NULL, GFP_ATOMIC);
+
+drop:
+	stats->dropped++;
+	dev_kfree_skb(skb);
+}
+
+/* Receive path handler that a low level driver supporting 802.11 hdr decap
+ * offload can call. The frame is in ethernet format and the assumption is
+ * all necessary operations like decryption, defrag, deaggregation, etc.
+ * requiring 802.11 headers are already performed in the low level driver
+ * or hardware.
+ */
+void ieee80211_rx_8023(struct ieee80211_hw *hw,
+		       struct ieee80211_sta *pubsta, struct sk_buff *skb,
+		       struct napi_struct *napi)
+{
+	struct ieee80211_local *local = hw_to_local(hw);
+	struct sta_info *sta;
+
+	if (unlikely(local->quiescing || local->suspended))
+		goto drop;
+
+	if (unlikely(local->in_reconfig))
+		goto drop;
+
+	if (WARN_ON(!local->started))
+		goto drop;
+
+	if (!pubsta)
+		goto drop;
+
+	sta  = container_of(pubsta, struct sta_info, sta);
+
+	/* TODO: Toggle Rx throughput LED */
+
+	rcu_read_lock();
+	ieee80211_rx_handle_8023(sta->sdata, sta, skb, napi);
+	rcu_read_unlock();
+
+	return;
+drop:
+	kfree_skb(skb);
+}
+EXPORT_SYMBOL(ieee80211_rx_8023);