From patchwork Thu Aug 23 06:54:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 179522 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 814D92C00A2 for ; Thu, 23 Aug 2012 16:54:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757954Ab2HWGyJ (ORCPT ); Thu, 23 Aug 2012 02:54:09 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:43534 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757454Ab2HWGyG (ORCPT ); Thu, 23 Aug 2012 02:54:06 -0400 Received: by qaas11 with SMTP id s11so399522qaa.19 for ; Wed, 22 Aug 2012 23:54:05 -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=F1HemqH1xOWLzl84H9EceyZftQF4y8s2d/JM5JdUoww=; b=SeXxhPNSmP4OGf+ZuYCCWA9fpZd1JTBvu5jtJYRRuOw8j5fWvsKICC8MEd4fKWbOpr RH23Gbpo/7sg7HDToa5/oK+WXJm2f6RAH660zgd5/cFx9MtfMs3t/VEiGdcW/EUSL5Y4 rmJh2lNMrf5zkjIXTBkIECTnL6MnBCIAzlzsgrcLCl1JPWOe7UBt+JAGTGMhkfTlHRdK roHhybK5NyHSJ64Jxttetrhne7QV4jPl13JwEm8U+UoNumFfYCBziLHbTifsILwW4pR1 tyM8t3kuWXjsk1jPeM+nynXFOxwUZzU+0Y50zXN/p3rXMQNOYu0pasWDVk0gAsh3nc/q q4HQ== MIME-Version: 1.0 Received: by 10.224.180.70 with SMTP id bt6mr1208075qab.91.1345704845803; Wed, 22 Aug 2012 23:54:05 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Wed, 22 Aug 2012 23:54:05 -0700 (PDT) Date: Thu, 23 Aug 2012 14:54:05 +0800 Message-ID: Subject: [PATCH] ipw2200: 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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/ipw2200.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" 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/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 0df4591..935120f 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c @@ -9037,18 +9037,11 @@ static int ipw_wx_set_wap(struct net_device *dev, { struct ipw_priv *priv = libipw_priv(dev); - static const unsigned char any[] = { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff - }; - static const unsigned char off[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }; - if (wrqu->ap_addr.sa_family != ARPHRD_ETHER) return -EINVAL; mutex_lock(&priv->mutex); - 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("Setting AP BSSID to ANY\n"); priv->config &= ~CFG_STATIC_BSSID;