diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 04:49:47 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 04:49:47 +0200 |
| commit | 245ac8738b0b840552d56b842e70e750d65911cc (patch) | |
| tree | 2609d6b0a8c603804d71aed65d7f74097ebe0e58 /include | |
| parent | Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6) (diff) | |
| parent | Update is_multicast_ether_addr() definition; net/ieee80211.h cleanups. (diff) | |
| download | linux-245ac8738b0b840552d56b842e70e750d65911cc.tar.xz linux-245ac8738b0b840552d56b842e70e750d65911cc.zip | |
Merge upstream net/ieee80211.h changes into 'ieee80211' branch.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/etherdevice.h | 2 | ||||
| -rw-r--r-- | include/net/ieee80211.h | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index a1478258d002..8a2df4dfbc59 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -65,7 +65,7 @@ static inline int is_zero_ether_addr(const u8 *addr) */ static inline int is_multicast_ether_addr(const u8 *addr) { - return addr[0] & 0x01; + return ((addr[0] != 0xff) && (0x01 & addr[0])); } /** diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index f1d9b9e9dec7..065b702df563 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -625,17 +625,6 @@ enum ieee80211_state { #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5] -extern inline int is_multicast_ether_addr(const u8 *addr) -{ - return ((addr[0] != 0xff) && (0x01 & addr[0])); -} - -extern inline int is_broadcast_ether_addr(const u8 *addr) -{ - return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ - (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); -} - #define CFG_IEEE80211_RESERVE_FCS (1<<0) #define CFG_IEEE80211_COMPUTE_FCS (1<<1) |