From 174479c177142c49d28e127782b4d25f55437c0b Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Mon, 4 Jul 2011 00:00:22 +0000
Subject: [PATCH] --- yaml --- r: 256051 b: refs/heads/master c:
 d4d2d288972233fc054f3b3341c2a15865fba7c6 h: refs/heads/master i:   256049:
 e093395b79c1859e60c5a6cd0af50385e51c58bf   256047:
 f6130ed6b614cae4a0275bc48835abd098f6b834 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/wireless/ipw2x00/libipw_rx.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5f5cd8c97274..26e6811ef7fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8d4aa29762fe1ae78ec3164f8f612f7b06d58ea
+refs/heads/master: d4d2d288972233fc054f3b3341c2a15865fba7c6
diff --git a/trunk/drivers/net/wireless/ipw2x00/libipw_rx.c b/trunk/drivers/net/wireless/ipw2x00/libipw_rx.c
index e5ad76cd77da..32a9966c3bf6 100644
--- a/trunk/drivers/net/wireless/ipw2x00/libipw_rx.c
+++ b/trunk/drivers/net/wireless/ipw2x00/libipw_rx.c
@@ -442,7 +442,7 @@ int libipw_rx(struct libipw_device *ieee, struct sk_buff *skb,
 		 * 802.11, but makes it easier to use different keys with
 		 * stations that do not support WEP key mapping). */
 
-		if (!(hdr->addr1[0] & 0x01) || local->bcrx_sta_key)
+		if (is_unicast_ether_addr(hdr->addr1) || local->bcrx_sta_key)
 			(void)hostap_handle_sta_crypto(local, hdr, &crypt,
 						       &sta);
 #endif
@@ -772,7 +772,7 @@ int libipw_rx(struct libipw_device *ieee, struct sk_buff *skb,
 
 #ifdef NOT_YET
 	if (ieee->iw_mode == IW_MODE_MASTER && !wds && ieee->ap->bridge_packets) {
-		if (dst[0] & 0x01) {
+		if (is_multicast_ether_addr(dst)) {
 			/* copy multicast frame both to the higher layers and
 			 * to the wireless media */
 			ieee->ap->bridged_multicast++;