From acc7ae4ab72bd79d8a1b34a6c76c029d5711968c Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sun, 26 Aug 2012 09:00:30 +0800
Subject: [PATCH] --- yaml --- r: 324734 b: refs/heads/master c:
 8cfbc9dcde38c167b10c9c1b74f410f9a577b857 h: refs/heads/master v: v3

---
 [refs]                                                      | 2 +-
 .../drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 633ad0548d3b..ae87c31ed747 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c43e56c3001fa4c55b01abf0d8a12bbc79aa148
+refs/heads/master: 8cfbc9dcde38c167b10c9c1b74f410f9a577b857
diff --git a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index a6adfc916291..6721ed9efc3b 100644
--- a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -20,6 +20,8 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <asm/uaccess.h>
+#include <linux/etherdevice.h>
+
 #include "dot11d.h"
 
 u8 rsn_authen_cipher_suite[16][4] = {
@@ -2969,9 +2971,7 @@ static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,
 			       param->u.crypt.key_len);
 		return -EINVAL;
 	}
-	if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
-	    param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
-	    param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
+	if (is_broadcast_ether_addr(param->sta_addr)) {
 		if (param->u.crypt.idx >= WEP_KEYS)
 			return -EINVAL;
 		crypt = &ieee->crypt[param->u.crypt.idx];