diff options
Diffstat (limited to 'net/ieee80211/ieee80211_rx.c')
-rw-r--r-- | net/ieee80211/ieee80211_rx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index d97e5412e31b..4084909f6f92 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
@@ -663,7 +663,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
663 | * any security data (IV, ICV, etc) that was left behind */ | 663 | * any security data (IV, ICV, etc) that was left behind */ |
664 | if (!can_be_decrypted && (fc & IEEE80211_FCTL_PROTECTED) && | 664 | if (!can_be_decrypted && (fc & IEEE80211_FCTL_PROTECTED) && |
665 | ieee->host_strip_iv_icv) { | 665 | ieee->host_strip_iv_icv) { |
666 | int trimlen = 0; | 666 | int trimlen = 0; |
667 | 667 | ||
668 | /* Top two-bits of byte 3 are the key index */ | 668 | /* Top two-bits of byte 3 are the key index */ |
669 | if (skb->len >= hdrlen + 3) | 669 | if (skb->len >= hdrlen + 3) |
@@ -852,7 +852,7 @@ void ieee80211_rx_any(struct ieee80211_device *ieee, | |||
852 | 852 | ||
853 | if ((fc & IEEE80211_FCTL_VERS) != 0) | 853 | if ((fc & IEEE80211_FCTL_VERS) != 0) |
854 | goto drop_free; | 854 | goto drop_free; |
855 | 855 | ||
856 | switch (fc & IEEE80211_FCTL_FTYPE) { | 856 | switch (fc & IEEE80211_FCTL_FTYPE) { |
857 | case IEEE80211_FTYPE_MGMT: | 857 | case IEEE80211_FTYPE_MGMT: |
858 | if (skb->len < sizeof(struct ieee80211_hdr_3addr)) | 858 | if (skb->len < sizeof(struct ieee80211_hdr_3addr)) |
@@ -1489,7 +1489,7 @@ static void update_network(struct ieee80211_network *dst, | |||
1489 | 1489 | ||
1490 | /* We only update the statistics if they were created by receiving | 1490 | /* We only update the statistics if they were created by receiving |
1491 | * the network information on the actual channel the network is on. | 1491 | * the network information on the actual channel the network is on. |
1492 | * | 1492 | * |
1493 | * This keeps beacons received on neighbor channels from bringing | 1493 | * This keeps beacons received on neighbor channels from bringing |
1494 | * down the signal level of an AP. */ | 1494 | * down the signal level of an AP. */ |
1495 | if (dst->channel == src->stats.received_channel) | 1495 | if (dst->channel == src->stats.received_channel) |