Commit 884d5ba5 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: remove is_{multicast,broadcast}_mac_addr 



Remove custom is_multicast_mac_addr() and is_broadcast_mac_addr().
Use is_multicast_ether_addr() instead.

By definition the broadcast address is also a multicast address.
is_multicast_ether_addr() returns true for broadcast addresses.
Hence checking for multicast in the conditional is sufficient.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bb4e1ca9

drivers/staging/rtl8188eu/core/rtw_recv.c

+1 −2
Original line number Diff line number Diff line
@@ -952,8 +952,7 @@ static int validate_recv_mgnt_frame(struct adapter *padapter, 
			if (!memcmp(padapter->eeprompriv.mac_addr,

				    GetAddr1Ptr(precv_frame->pkt->data), ETH_ALEN))

				psta->sta_stats.rx_probersp_pkts++;

			else if (is_broadcast_mac_addr(GetAddr1Ptr(precv_frame->pkt->data)) ||

				 is_multicast_mac_addr(GetAddr1Ptr(precv_frame->pkt->data)))

			else if (is_multicast_ether_addr(GetAddr1Ptr(precv_frame->pkt->data)))

				psta->sta_stats.rx_probersp_bm_pkts++;

			else

				psta->sta_stats.rx_probersp_uo_pkts++;

drivers/staging/rtl8188eu/include/ieee80211.h

+0 −11
Original line number Diff line number Diff line
@@ -515,17 +515,6 @@ enum ieee80211_state { 
#define DEFAULT_MAX_SCAN_AGE (15 * HZ)

#define DEFAULT_FTS 2346



static inline int is_multicast_mac_addr(const u8 *addr)

{

	return ((addr[0] != 0xff) && (0x01 & addr[0]));

}



static inline int is_broadcast_mac_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	BIT(0)

#define CFG_IEEE80211_COMPUTE_FCS	BIT(1)