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

Commit 4cc0dba9 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: move netdev stats to common function 



Move the netdev stats accounting into the common function
ieee80211_deliver_skb() that is called in both places.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent eeca9fce

net/mac80211/rx.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -2043,6 +2043,9 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx) 
	struct sta_info *dsta;

	struct sta_info *dsta;

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

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





	dev->stats.rx_packets++;

	dev->stats.rx_bytes += rx->skb->len;



	skb = rx->skb;

	skb = rx->skb;

	xmit_skb = NULL;

	xmit_skb = NULL;
@@ -2173,8 +2176,6 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx) 
			dev_kfree_skb(rx->skb);

			dev_kfree_skb(rx->skb);

			continue;

			continue;

		}

		}

		dev->stats.rx_packets++;

		dev->stats.rx_bytes += rx->skb->len;





		ieee80211_deliver_skb(rx);

		ieee80211_deliver_skb(rx);

	}

	}
@@ -2397,9 +2398,6 @@ ieee80211_rx_h_data(struct ieee80211_rx_data *rx) 




	rx->skb->dev = dev;

	rx->skb->dev = dev;





	dev->stats.rx_packets++;

	dev->stats.rx_bytes += rx->skb->len;



	if (local->ps_sdata && local->hw.conf.dynamic_ps_timeout > 0 &&

	if (local->ps_sdata && local->hw.conf.dynamic_ps_timeout > 0 &&

	    !is_multicast_ether_addr(

	    !is_multicast_ether_addr(

		    ((struct ethhdr *)rx->skb->data)->h_dest) &&

		    ((struct ethhdr *)rx->skb->data)->h_dest) &&