aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2x00/ipw2100.c
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-08-23 02:53:24 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-09-07 15:03:36 -0400
commit96e716b27ab02534f45a9fb1cb87097997bc6bd5 (patch)
tree357c54a765ce00e6e9ac5aa88180eabada274b3b /drivers/net/wireless/ipw2x00/ipw2100.c
parent32e31de5c37856dba7f174970806e38199e53d81 (diff)
ipw2100: use is_zero_ether_addr() and is_broadcast_ether_addr()
Using is_zero_ether_addr() and is_broadcast_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>
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.c')
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 95aa8e1683e..c3e14b2104e 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -6963,13 +6963,6 @@ static int ipw2100_wx_set_wap(struct net_device *dev,
6963 struct ipw2100_priv *priv = libipw_priv(dev); 6963 struct ipw2100_priv *priv = libipw_priv(dev);
6964 int err = 0; 6964 int err = 0;
6965 6965
6966 static const unsigned char any[] = {
6967 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
6968 };
6969 static const unsigned char off[] = {
6970 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
6971 };
6972
6973 // sanity checks 6966 // sanity checks
6974 if (wrqu->ap_addr.sa_family != ARPHRD_ETHER) 6967 if (wrqu->ap_addr.sa_family != ARPHRD_ETHER)
6975 return -EINVAL; 6968 return -EINVAL;
@@ -6980,8 +6973,8 @@ static int ipw2100_wx_set_wap(struct net_device *dev,
6980 goto done; 6973 goto done;
6981 } 6974 }
6982 6975
6983 if (!memcmp(any, wrqu->ap_addr.sa_data, ETH_ALEN) || 6976 if (is_broadcast_ether_addr(wrqu->ap_addr.sa_data) ||
6984 !memcmp(off, wrqu->ap_addr.sa_data, ETH_ALEN)) { 6977 is_zero_ether_addr(wrqu->ap_addr.sa_data)) {
6985 /* we disable mandatory BSSID association */ 6978 /* we disable mandatory BSSID association */
6986 IPW_DEBUG_WX("exit - disable mandatory BSSID\n"); 6979 IPW_DEBUG_WX("exit - disable mandatory BSSID\n");
6987 priv->config &= ~CFG_STATIC_BSSID; 6980 priv->config &= ~CFG_STATIC_BSSID;