summaryrefslogtreecommitdiffstats
path: root/net/ieee80211
diff options
context:
space:
mode:
authorJiri Benc <jbenc@suse.cz>2005-05-24 15:10:18 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-05-27 22:43:30 -0400
commit286d974797705ae7ceedc846666ef98bdeee3646 (patch)
tree512275d067849ba49a41d1fe00b9954cb1fe38ee /net/ieee80211
parent76fe1b0e4c093f985c66a062c9c10370b4985796 (diff)
downloadop-kernel-dev-286d974797705ae7ceedc846666ef98bdeee3646.zip
op-kernel-dev-286d974797705ae7ceedc846666ef98bdeee3646.tar.gz
[PATCH] ieee80211: cleanup
Cleanup of unused and duplicated constants and structures in the ieee80211 header. Signed-off-by: Jiri Benc <jbenc@suse.cz> Signed-off-by: Jirka Bohac <jbohac@suse.cz>
Diffstat (limited to 'net/ieee80211')
-rw-r--r--net/ieee80211/ieee80211_rx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 2bda8a1..2ae6ab8 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -475,7 +475,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
#endif
/* Data frame - extract src/dst addresses */
- if (skb->len < IEEE80211_DATA_HDR3_LEN)
+ if (skb->len < IEEE80211_3ADDR_LEN)
goto rx_dropped;
switch (fc & (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) {
@@ -488,7 +488,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
memcpy(src, hdr->addr2, ETH_ALEN);
break;
case IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS:
- if (skb->len < IEEE80211_DATA_HDR4_LEN)
+ if (skb->len < IEEE80211_4ADDR_LEN)
goto rx_dropped;
memcpy(dst, hdr->addr3, ETH_ALEN);
memcpy(src, hdr->addr4, ETH_ALEN);
OpenPOWER on IntegriCloud