Commit 35622dc2 authored by Wei Yongjun's avatar Wei Yongjun Committed by John W. Linville
Browse files

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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4653356f

drivers/net/wireless/hostap/hostap_ioctl.c

+5 −10
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/ethtool.h>

#include <linux/if_arp.h>

#include <linux/module.h>

#include <linux/etherdevice.h>

#include <net/lib80211.h>



#include "hostap_wlan.h"
@@ -3221,8 +3222,7 @@ static int prism2_ioctl_siwencodeext(struct net_device *dev, 
		return -EINVAL;



	addr = ext->addr.sa_data;

	if (addr[0] == 0xff && addr[1] == 0xff && addr[2] == 0xff &&

	    addr[3] == 0xff && addr[4] == 0xff && addr[5] == 0xff) {

	if (is_broadcast_ether_addr(addr)) {

		sta_ptr = NULL;

		crypt = &local->crypt_info.crypt[i];

	} else {
@@ -3394,8 +3394,7 @@ static int prism2_ioctl_giwencodeext(struct net_device *dev, 
		i--;



	addr = ext->addr.sa_data;

	if (addr[0] == 0xff && addr[1] == 0xff && addr[2] == 0xff &&

	    addr[3] == 0xff && addr[4] == 0xff && addr[5] == 0xff) {

	if (is_broadcast_ether_addr(addr)) {

		sta_ptr = NULL;

		crypt = &local->crypt_info.crypt[i];

	} else {
@@ -3458,9 +3457,7 @@ static int prism2_ioctl_set_encryption(local_info_t *local, 
	    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;

		sta_ptr = NULL;
@@ -3593,9 +3590,7 @@ static int prism2_ioctl_get_encryption(local_info_t *local, 
	if (max_key_len < 0)

		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)) {

		sta_ptr = NULL;

		if (param->u.crypt.idx >= WEP_KEYS)

			param->u.crypt.idx = local->crypt_info.tx_keyidx;

CRA Git | Maintained and supported by SUSTech CRA and CCSE