From patchwork Sun Aug 26 00:54:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1374201 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5D7BDDF6DA for ; Sun, 26 Aug 2012 00:54:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753291Ab2HZAym (ORCPT ); Sat, 25 Aug 2012 20:54:42 -0400 Received: from mail-qa0-f53.google.com ([209.85.216.53]:56541 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751471Ab2HZAyl (ORCPT ); Sat, 25 Aug 2012 20:54:41 -0400 Received: by qaas11 with SMTP id s11so1209847qaa.19 for ; Sat, 25 Aug 2012 17:54:41 -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=c97vWHIjjDeDdRtNyZxz3HQJCHIX5z9L0/VsQm7Tgiw=; b=yI05M5QRqh5QKwFtCPuhVk/9NS0QLpgjKqOoewAU0aDfQTrX+5Z5TJaZqq12XjKHn5 BtadINfp0Lk20ltp3nMvlgEvjP9TIZy5ViX2/hh6WQ4LrqSkpkCNk9MyqXOgx49lEYPL XmOt0H1cPrFKJXErfPbSipVDndZqbP+0SdkgHvj+cKOH+fMGOWlJNhiYJ2btvIZ3w43f zcFIkGm5R80xBOisudooQEnwDYkK8/USu51akm6Do1Sv6WNt7sKKsDD3sb5wk7tRk1ah 7d1CIOV7FE90oWnu7+ZbRfCjcFJfVMjcPQ4kD9fIYLk4cTXazqZlAgXXIHqcv8QfLg4o cBTQ== MIME-Version: 1.0 Received: by 10.224.180.70 with SMTP id bt6mr16431424qab.91.1345942481138; Sat, 25 Aug 2012 17:54:41 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Sat, 25 Aug 2012 17:54:41 -0700 (PDT) Date: Sun, 26 Aug 2012 08:54:41 +0800 Message-ID: Subject: [PATCH] wireless: use is_broadcast_ether_addr() instead of memcmp() From: Wei Yongjun To: j@w1.fi, 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_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 --- drivers/net/wireless/hostap/hostap_ioctl.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 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/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index 18054d9..ac07473 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #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;