OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wireless: use is_broadcast_ether_addr() instead of memcmp() 

Using is_broadcast_ether_addr() instead of directly use
memcmp() to determine if the ethernet address is broadcast
address.

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:
Wei Yongjun 2012-08-26 08:54:41 +08:00 committed by John W. Linville
parent 4653356f69
commit 35622dc26e
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/wireless/hostap/hostap_ioctl.c
View File

@ -6,6 +6,7 @@
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/etherdevice.h>
#include <net/lib80211.h> #include <net/lib80211.h>
#include "hostap_wlan.h" #include "hostap_wlan.h"
@ -3221,8 +3222,7 @@ static int prism2_ioctl_siwencodeext(struct net_device *dev,
return -EINVAL; return -EINVAL;
addr = ext->addr.sa_data; addr = ext->addr.sa_data;
if (addr[0] == 0xff && addr[1] == 0xff && addr[2] == 0xff && if (is_broadcast_ether_addr(addr)) {
addr[3] == 0xff && addr[4] == 0xff && addr[5] == 0xff) {
sta_ptr = NULL; sta_ptr = NULL;
crypt = &local->crypt_info.crypt[i]; crypt = &local->crypt_info.crypt[i];
} else { } else {
@ -3394,8 +3394,7 @@ static int prism2_ioctl_giwencodeext(struct net_device *dev,
i--; i--;
addr = ext->addr.sa_data; addr = ext->addr.sa_data;
if (addr[0] == 0xff && addr[1] == 0xff && addr[2] == 0xff && if (is_broadcast_ether_addr(addr)) {
addr[3] == 0xff && addr[4] == 0xff && addr[5] == 0xff) {
sta_ptr = NULL; sta_ptr = NULL;
crypt = &local->crypt_info.crypt[i]; crypt = &local->crypt_info.crypt[i];
} else { } else {
@ -3458,9 +3457,7 @@ static int prism2_ioctl_set_encryption(local_info_t *local,
param->u.crypt.key_len) param->u.crypt.key_len)
return -EINVAL; return -EINVAL;
if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && if (is_broadcast_ether_addr(param->sta_addr)) {
param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
if (param->u.crypt.idx >= WEP_KEYS) if (param->u.crypt.idx >= WEP_KEYS)
return -EINVAL; return -EINVAL;
sta_ptr = NULL; sta_ptr = NULL;
@ -3593,9 +3590,7 @@ static int prism2_ioctl_get_encryption(local_info_t *local,
if (max_key_len < 0) if (max_key_len < 0)
return -EINVAL; return -EINVAL;
if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && if (is_broadcast_ether_addr(param->sta_addr)) {
param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
sta_ptr = NULL; sta_ptr = NULL;
if (param->u.crypt.idx >= WEP_KEYS) if (param->u.crypt.idx >= WEP_KEYS)
param->u.crypt.idx = local->crypt_info.tx_keyidx; param->u.crypt.idx = local->crypt_info.tx_keyidx;