From 7d8b09476fa368fe2bc163915194956b6778b323 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Thu, 24 Jun 2010 14:25:56 -0400 Subject: [PATCH] --- yaml --- r: 203303 b: refs/heads/master c: 5548a8a1138c96e3e6f803c9f2c1f9389c2f0ee6 h: refs/heads/master i: 203301: f8c43287f588849451214a1d069fc9d4ad560993 203299: c951f9b824012a24a4916790c63c76a084d95358 203295: c6ad54ed6feada033b7fc72921f10709affbc725 v: v3 --- [refs] | 2 +- trunk/net/mac80211/rx.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3bdb784027ed..2745385be64c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 679db794679baae96ce0a2257daaeaedef4e8352 +refs/heads/master: 5548a8a1138c96e3e6f803c9f2c1f9389c2f0ee6 diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c index ab58a5d66d2e..d70e1a9c4354 100644 --- a/trunk/net/mac80211/rx.c +++ b/trunk/net/mac80211/rx.c @@ -293,7 +293,7 @@ ieee80211_rx_monitor(struct ieee80211_local *local, struct sk_buff *origskb, skb2 = skb_clone(skb, GFP_ATOMIC); if (skb2) { skb2->dev = prev_dev; - netif_rx(skb2); + netif_receive_skb(skb2); } } @@ -304,7 +304,7 @@ ieee80211_rx_monitor(struct ieee80211_local *local, struct sk_buff *origskb, if (prev_dev) { skb->dev = prev_dev; - netif_rx(skb); + netif_receive_skb(skb); } else dev_kfree_skb(skb); @@ -1578,7 +1578,7 @@ 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_rx(skb); + netif_receive_skb(skb); } } @@ -2244,7 +2244,7 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx, skb2 = skb_clone(skb, GFP_ATOMIC); if (skb2) { skb2->dev = prev_dev; - netif_rx(skb2); + netif_receive_skb(skb2); } } @@ -2255,7 +2255,7 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx, if (prev_dev) { skb->dev = prev_dev; - netif_rx(skb); + netif_receive_skb(skb); skb = NULL; } else goto out_free_skb;