diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:03:32 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:03:32 -0500 |
| commit | c77986c78aa941af8266272841567e78b72d54cc (patch) | |
| tree | cb30e1bd7d5799bfce5a3837bcfddee059a81733 /net/mac80211/rx.c | |
| parent | 9e4b4269ecee426f1647425a24186dd1566db554 (diff) | |
| parent | 6658ab80fd4ef940fc2366ddb66690a15ea69c18 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 593062109c50..58e4b7052d17 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1954,7 +1954,10 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx) /* deliver to local stack */ skb->protocol = eth_type_trans(skb, dev); memset(skb->cb, 0, sizeof(skb->cb)); - netif_receive_skb(skb); + if (rx->local->napi) + napi_gro_receive(rx->local->napi, skb); + else + netif_receive_skb(skb); } if (xmit_skb) { |