Update is_multicast_ether_addr() definition; net/ieee80211.h cleanups.

diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index a147825..8a2df4d 100644 (file)
--- 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 --cc include/net/ieee80211.h
Simple merge