2 files changed, 13 insertions, 7 deletions

diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c
index ecc9bb196abc..cb71d794a7d1 100644
--- a/net/ieee80211/ieee80211_crypt.c
+++ b/net/ieee80211/ieee80211_crypt.c
@@ -18,7 +18,6 @@
 #include <linux/string.h>
 #include <net/ieee80211.h>
 
-
 MODULE_AUTHOR("Jouni Malinen");
 MODULE_DESCRIPTION("HostAP crypto");
 MODULE_LICENSE("GPL");
@@ -33,11 +32,11 @@ static DEFINE_SPINLOCK(ieee80211_crypto_lock);
 
 void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, int force)
 {
-        struct ieee80211_crypt_data *entry, *next;
+        struct ieee80211_crypt_data *entry, *next;
         unsigned long flags;
 
         spin_lock_irqsave(&ieee->lock, flags);
-        list_for_each_entry_safe(entry, next, &ieee->crypt_deinit_list, list) {
+        list_for_each_entry_safe(entry, next, &ieee->crypt_deinit_list, list) {
                 if (atomic_read(&entry->refcnt) != 0 && !force)
                         continue;
 
@@ -141,9 +140,9 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
         spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
         return -EINVAL;
 
- found:
+      found:
         printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm "
-                          "'%s'\n", ops->name);
+               "'%s'\n", ops->name);
         list_del(&alg->list);
         spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
         kfree(alg);
@@ -163,7 +162,7 @@ struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name)
         spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
         return NULL;
 
- found:
+      found:
         spin_unlock_irqrestore(&ieee80211_crypto_lock, flags);
         return alg->ops;
 }
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 695d0478fd12..3ae91118c736 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -754,7 +754,14 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                 memset(skb->cb, 0, sizeof(skb->cb));
                 skb->dev = dev;
                 skb->ip_summed = CHECKSUM_NONE; /* 802.11 crc not sufficient */
-                netif_rx(skb);
+                if (netif_rx(skb) == NET_RX_DROP) {
+                        /* netif_rx always succeeds, but it might drop
+                         * the packet.  If it drops the packet, we log that
+                         * in our stats. */
+                        IEEE80211_DEBUG_DROP
+                            ("RX: netif_rx dropped the packet\n");
+                        stats->rx_dropped++;
+                }
         }
 
       rx_exit: