drivers/net: use is_zero_ether_addr() instead of memcmp()
Using is_zero_ether_addr() instead of directly use memcmp() to determine if the ethernet address is all zeros. spatch with a semantic match is used to found this problem. (http://coccinelle.lip6.fr/) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
6977a6b01d
commit
c3a2ee9350
|
@ -4,6 +4,7 @@
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/export.h>
|
#include <linux/export.h>
|
||||||
|
#include <linux/etherdevice.h>
|
||||||
#include "hostap_wlan.h"
|
#include "hostap_wlan.h"
|
||||||
#include "hostap.h"
|
#include "hostap.h"
|
||||||
#include "hostap_ap.h"
|
#include "hostap_ap.h"
|
||||||
|
@ -463,8 +464,7 @@ static void handle_info_queue_scanresults(local_info_t *local)
|
||||||
prism2_host_roaming(local);
|
prism2_host_roaming(local);
|
||||||
|
|
||||||
if (local->host_roaming == 2 && local->iw_mode == IW_MODE_INFRA &&
|
if (local->host_roaming == 2 && local->iw_mode == IW_MODE_INFRA &&
|
||||||
memcmp(local->preferred_ap, "\x00\x00\x00\x00\x00\x00",
|
!is_zero_ether_addr(local->preferred_ap)) {
|
||||||
ETH_ALEN) != 0) {
|
|
||||||
/*
|
/*
|
||||||
* Firmware seems to be getting into odd state in host_roaming
|
* Firmware seems to be getting into odd state in host_roaming
|
||||||
* mode 2 when hostscan is used without join command, so try
|
* mode 2 when hostscan is used without join command, so try
|
||||||
|
|
|
@ -1084,7 +1084,7 @@ int prism2_sta_deauth(local_info_t *local, u16 reason)
|
||||||
__le16 val = cpu_to_le16(reason);
|
__le16 val = cpu_to_le16(reason);
|
||||||
|
|
||||||
if (local->iw_mode != IW_MODE_INFRA ||
|
if (local->iw_mode != IW_MODE_INFRA ||
|
||||||
memcmp(local->bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) == 0 ||
|
is_zero_ether_addr(local->bssid) ||
|
||||||
memcmp(local->bssid, "\x44\x44\x44\x44\x44\x44", ETH_ALEN) == 0)
|
memcmp(local->bssid, "\x44\x44\x44\x44\x44\x44", ETH_ALEN) == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue