diff options
author | Jiri Benc <jbenc@suse.cz> | 2005-05-24 09:10:18 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:43:30 -0400 |
commit | 286d974797705ae7ceedc846666ef98bdeee3646 (patch) | |
tree | 512275d067849ba49a41d1fe00b9954cb1fe38ee /net/ieee80211/ieee80211_rx.c | |
parent | 76fe1b0e4c093f985c66a062c9c10370b4985796 (diff) |
[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/ieee80211_rx.c')
-rw-r--r-- | net/ieee80211/ieee80211_rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 2bda8a174818..2ae6ab8914b0 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, | |||
475 | #endif | 475 | #endif |
476 | 476 | ||
477 | /* Data frame - extract src/dst addresses */ | 477 | /* Data frame - extract src/dst addresses */ |
478 | if (skb->len < IEEE80211_DATA_HDR3_LEN) | 478 | if (skb->len < IEEE80211_3ADDR_LEN) |
479 | goto rx_dropped; | 479 | goto rx_dropped; |
480 | 480 | ||
481 | switch (fc & (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) { | 481 | switch (fc & (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) { |
@@ -488,7 +488,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
488 | memcpy(src, hdr->addr2, ETH_ALEN); | 488 | memcpy(src, hdr->addr2, ETH_ALEN); |
489 | break; | 489 | break; |
490 | case IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS: | 490 | case IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS: |
491 | if (skb->len < IEEE80211_DATA_HDR4_LEN) | 491 | if (skb->len < IEEE80211_4ADDR_LEN) |
492 | goto rx_dropped; | 492 | goto rx_dropped; |
493 | memcpy(dst, hdr->addr3, ETH_ALEN); | 493 | memcpy(dst, hdr->addr3, ETH_ALEN); |
494 | memcpy(src, hdr->addr4, ETH_ALEN); | 494 | memcpy(src, hdr->addr4, ETH_ALEN); |