Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324740
b: refs/heads/master
c: efe13d8
h: refs/heads/master
v: v3
  • Loading branch information
Wei Yongjun authored and Greg Kroah-Hartman committed Sep 4, 2012
1 parent 9327201 commit bd64b3f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f6aa782f255de96b89ff4fc98dad0d57a9691c8a
refs/heads/master: efe13d868f3475ae7c296fff02f10c84dd80d45c
7 changes: 4 additions & 3 deletions trunk/drivers/staging/rtl8192e/rtllib_softmac_wx.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
*/


#include <linux/etherdevice.h>

#include "rtllib.h"
#include "dot11d.h"
/* FIXME: add A freqs */
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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);

Expand Down

0 comments on commit bd64b3f

Please sign in to comment.