From patchwork Thu Aug 23 07:16:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 1364711 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 06635DF2AB for ; Thu, 23 Aug 2012 07:16:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933144Ab2HWHQq (ORCPT ); Thu, 23 Aug 2012 03:16:46 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:44712 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755593Ab2HWHQo (ORCPT ); Thu, 23 Aug 2012 03:16:44 -0400 Received: by qcro28 with SMTP id o28so279543qcr.19 for ; Thu, 23 Aug 2012 00:16:44 -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=lP9aGcJDVIsnM7tqI/IhQK6o6IrbwUF918xPcZsOVUg=; b=muBEutk5+FTgV2WZr/RJjuuXzVO7trIneWOylWKzAlQIhjE+NZLlDQDZRPGHyrDXKE C50B9MsCbotX5H5AUqtEHIbTr3EGzQNEUlcwjAo7D1nqzPLxckvVtrhaqZKLjH+p/TP7 rsa8SWYobgAAQ0gI0AQdtdpe3au86x2MfYF4JzoO2XYl8NMOacg8GiMDQ/LPkJw0vCz9 XA4w/m0/ePgHOkkdRv3jpFOopHWrdhRmBmd0G/MxUdP1YDYS9XtS/H0goYwlxfh+4qEW Sz3yfvWKIKiAdF8CzdZwJ0ZPCI8Yxg9oz84RW38a3kwig/x8HaDucXiaE1WIOpXjfQGI 4FLw== MIME-Version: 1.0 Received: by 10.229.136.14 with SMTP id p14mr217770qct.93.1345706204195; Thu, 23 Aug 2012 00:16:44 -0700 (PDT) Received: by 10.229.146.194 with HTTP; Thu, 23 Aug 2012 00:16:44 -0700 (PDT) Date: Thu, 23 Aug 2012 15:16:44 +0800 Message-ID: Subject: [PATCH] drivers/net: use is_zero_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_zero_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/hostap/hostap_info.c | 4 ++-- drivers/net/wireless/hostap/hostap_main.c | 2 +- 2 files changed, 3 insertions(+), 3 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_info.c b/drivers/net/wireless/hostap/hostap_info.c index 47932b2..970a48b 100644 --- a/drivers/net/wireless/hostap/hostap_info.c +++ b/drivers/net/wireless/hostap/hostap_info.c @@ -4,6 +4,7 @@ #include #include #include +#include #include "hostap_wlan.h" #include "hostap.h" #include "hostap_ap.h" @@ -463,8 +464,7 @@ static void handle_info_queue_scanresults(local_info_t *local) prism2_host_roaming(local); if (local->host_roaming == 2 && local->iw_mode == IW_MODE_INFRA && - memcmp(local->preferred_ap, "\x00\x00\x00\x00\x00\x00", - ETH_ALEN) != 0) { + !is_zero_ether_addr(local->preferred_ap)) { /* * Firmware seems to be getting into odd state in host_roaming * mode 2 when hostscan is used without join command, so try diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c index 627bc12..15f0fad 100644 --- a/drivers/net/wireless/hostap/hostap_main.c +++ b/drivers/net/wireless/hostap/hostap_main.c @@ -1084,7 +1084,7 @@ int prism2_sta_deauth(local_info_t *local, u16 reason) __le16 val = cpu_to_le16(reason); if (local->iw_mode != IW_MODE_INFRA || - memcmp(local->bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) == 0 || + is_zero_ether_addr(local->bssid) || memcmp(local->bssid, "\x44\x44\x44\x44\x44\x44", ETH_ALEN) == 0) return 0;