From patchwork Thu Aug 23 06:53:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1364641 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D67C33FC66 for ; Thu, 23 Aug 2012 06:53:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756976Ab2HWGx1 (ORCPT ); Thu, 23 Aug 2012 02:53:27 -0400 Received: from mail-qa0-f53.google.com ([209.85.216.53]:53376 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755486Ab2HWGxZ (ORCPT ); Thu, 23 Aug 2012 02:53:25 -0400 Received: by qaas11 with SMTP id s11so287757qaa.19 for ; Wed, 22 Aug 2012 23:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=dtmhVjWBQvSCFCQSUAWGBBwGVX1bG49tB4FQVfy9+ms=; b=MJgU8rZBFS7T5P+91ytoUMikNt5hZdl1xJ1xH5kOedfP2s9RLeqgofE+LYOMu22H2Z BUF3nwhTcTp6uvL+ty/BxipNVrwkeQaE49+pVSwnHaIHLRrgSNCjVqqTDsoX9hKHaKnD +XXm7H4IZ46lZWktnqsOh8sDy/hyb2f2bImXlfF9+UPalh7Zz7ZQJ2uYIWW+8FuKe8r4 7Pop7sxKKY+wDwRobJVOxQGh2MZMgLxbk/HJb6QNyJHBzifkzG95O2YuBkQri0g0HEH2 2XTNj24g4MocbkSsgyby26w18Kp/UK/Bxq9PILAP7vUUInr/h8zqLFwRy7bgN+uomCzY nrsA== MIME-Version: 1.0 Received: by 10.224.70.209 with SMTP id e17mr1317499qaj.38.1345704804613; Wed, 22 Aug 2012 23:53:24 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Wed, 22 Aug 2012 23:53:24 -0700 (PDT) Date: Thu, 23 Aug 2012 14:53:24 +0800 Message-ID: Subject: [PATCH] ipw2100: use is_zero_ether_addr() and is_broadcast_ether_addr() From: Wei Yongjun To: stas.yakovlev@gmail.com, linville@tuxdriver.com Cc: yongjun_wei@trendmicro.com.cn, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Wei Yongjun 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 --- drivers/net/wireless/ipw2x00/ipw2100.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 95aa8e1..c3e14b2 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, struct ipw2100_priv *priv = libipw_priv(dev); int err = 0; - static const unsigned char any[] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff - }; - static const unsigned char off[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }; - // sanity checks if (wrqu->ap_addr.sa_family != ARPHRD_ETHER) return -EINVAL; @@ -6980,8 +6973,8 @@ static int ipw2100_wx_set_wap(struct net_device *dev, goto done; } - if (!memcmp(any, wrqu->ap_addr.sa_data, ETH_ALEN) || - !memcmp(off, wrqu->ap_addr.sa_data, ETH_ALEN)) { + if (is_broadcast_ether_addr(wrqu->ap_addr.sa_data) || + is_zero_ether_addr(wrqu->ap_addr.sa_data)) { /* we disable mandatory BSSID association */ IPW_DEBUG_WX("exit - disable mandatory BSSID\n"); priv->config &= ~CFG_STATIC_BSSID;