From bd64b3fefd3135613f7061a9acac7d5e3d7a2fc6 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Thu, 23 Aug 2012 16:50:12 +0800 Subject: [PATCH] --- yaml --- r: 324740 b: refs/heads/master c: efe13d868f3475ae7c296fff02f10c84dd80d45c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192e/rtllib_softmac_wx.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3ae8c98d5bc3..76f4e16846aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6aa782f255de96b89ff4fc98dad0d57a9691c8a +refs/heads/master: efe13d868f3475ae7c296fff02f10c84dd80d45c diff --git a/trunk/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/trunk/drivers/staging/rtl8192e/rtllib_softmac_wx.c index 1bb6b52e0f24..740cf85e9d5b 100644 --- a/trunk/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/trunk/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -14,6 +14,8 @@ */ +#include + #include "rtllib.h" #include "dot11d.h" /* FIXME: add A freqs */ @@ -137,7 +139,6 @@ int rtllib_wx_set_wap(struct rtllib_device *ieee, { int ret = 0; - u8 zero[] = {0, 0, 0, 0, 0, 0}; unsigned long flags; short ifup = ieee->proto_started; @@ -157,7 +158,7 @@ int rtllib_wx_set_wap(struct rtllib_device *ieee, goto out; } - if (memcmp(temp->sa_data, zero, ETH_ALEN) == 0) { + if (is_zero_ether_addr(temp->sa_data)) { spin_lock_irqsave(&ieee->lock, flags); memcpy(ieee->current_network.bssid, temp->sa_data, ETH_ALEN); ieee->wap_set = 0; @@ -177,7 +178,7 @@ int rtllib_wx_set_wap(struct rtllib_device *ieee, ieee->cannot_notify = false; memcpy(ieee->current_network.bssid, temp->sa_data, ETH_ALEN); - ieee->wap_set = (memcmp(temp->sa_data, zero, ETH_ALEN) != 0); + ieee->wap_set = !is_zero_ether_addr(temp->sa_data); spin_unlock_irqrestore(&ieee->lock, flags);