Commit 245ac873 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge upstream net/ieee80211.h changes into 'ieee80211' branch.

parents 716b4330 a5fe736e

drivers/net/skge.c

+829 −881

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/skge.h

+104 −482

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/etherdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -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]));

}



/**

include/net/ieee80211.h

+0 −11
Original line number Diff line number Diff line
@@ -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)