From 970dc653be2a18c15b35d044d8dd930d16275c64 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sun, 26 Aug 2012 08:59:58 +0800
Subject: [PATCH] --- yaml --- r: 324735 b: refs/heads/master c:
 148d711654cf0387fda241df3b9716783a60f803 h: refs/heads/master i:   324733:
 894058ee17807ba2d80d927af4638fdb9c2ac0db   324731:
 42b8ab7024f82e0061d89ee5e4667a6789f18874   324727:
 7695ca5c7337d8821d6cc7f1115cb06c6c794c6e   324719:
 ef46b014f2acaa609c0f3b47c7d13817dfadc4b7   324703:
 1ea12a98cf89ad03cfc37d0f2192c41858554957   324671:
 f33b7be75c6e21688f1fa48be0d453f101debcb3   324607:
 3e275cd4f18a97bb227afd80f3923e91e3e4b40f v: v3

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

diff --git a/[refs] b/[refs]
index ae87c31ed747..d0aee827a519 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cfbc9dcde38c167b10c9c1b74f410f9a577b857
+refs/heads/master: 148d711654cf0387fda241df3b9716783a60f803
diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index 8173240dcf7a..7c669a23f7cf 100644
--- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@ -21,6 +21,7 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <asm/uaccess.h>
+#include <linux/etherdevice.h>
 
 #include "dot11d.h"
 u8 rsn_authen_cipher_suite[16][4] = {
@@ -2808,9 +2809,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];