1 files changed, 9 insertions, 9 deletions

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index a8aa0f2411a2..fa0f37e4afe4 100644
--- a/net/mac80211/rx.c
+++ b/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);
                 }
         }
 
@@ -2056,11 +2056,11 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
         nskb = skb_copy_expand(rx->skb, local->hw.extra_tx_headroom, 0,
                                GFP_ATOMIC);
         if (nskb) {
-                struct ieee80211_mgmt *mgmt = (void *)nskb->data;
+                struct ieee80211_mgmt *nmgmt = (void *)nskb->data;
 
-                mgmt->u.action.category |= 0x80;
-                memcpy(mgmt->da, mgmt->sa, ETH_ALEN);
-                memcpy(mgmt->sa, rx->sdata->vif.addr, ETH_ALEN);
+                nmgmt->u.action.category |= 0x80;
+                memcpy(nmgmt->da, nmgmt->sa, ETH_ALEN);
+                memcpy(nmgmt->sa, rx->sdata->vif.addr, ETH_ALEN);
 
                 memset(nskb->cb, 0, sizeof(nskb->cb));
 
@@ -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;