From patchwork Wed Jun 29 23:47:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franky Lin X-Patchwork-Id: 930702 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5TNnXkB030647 for ; Wed, 29 Jun 2011 23:49:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758018Ab1F2Xta (ORCPT ); Wed, 29 Jun 2011 19:49:30 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:4613 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757747Ab1F2Xso (ORCPT ); Wed, 29 Jun 2011 19:48:44 -0400 Received: from [10.9.200.131] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Wed, 29 Jun 2011 16:53:11 -0700 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB01.corp.ad.broadcom.com (10.9.200.131) with Microsoft SMTP Server id 8.2.247.2; Wed, 29 Jun 2011 16:48:36 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 3F27A74D15; Wed, 29 Jun 2011 16:48:30 -0700 (PDT) Received: from lc-sj1-3560.broadcom.com (lc-sj1-3560.sj.broadcom.com [10.17.194.250]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 66CD720522; Wed, 29 Jun 2011 16:48:25 -0700 (PDT) Received: by lc-sj1-3560.broadcom.com (Postfix, from userid 25250) id CF2102C19D31; Wed, 29 Jun 2011 16:48:23 -0700 (PDT) From: "Franky Lin" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 042/119] staging: brcm80211: replace macro BCM_MSG_IFNAME_MAX with IFNAMSIZ Date: Wed, 29 Jun 2011 16:47:06 -0700 Message-ID: <1309391303-22741-43-git-send-email-frankyl@broadcom.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1309391303-22741-1-git-send-email-frankyl@broadcom.com> References: <1309391303-22741-1-git-send-email-frankyl@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 6215656D62O16333073-01-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 29 Jun 2011 23:49:33 +0000 (UTC) From: Arend van Spriel In dhd.h the macro BCM_MSG_IFNAME_MAX was defined and used. As this is used to carry the interface name we might as well use IFNAMSIZ which results in the same size. Signed-off-by: Arend van Spriel Reviewed-by: Roland Vossen Reviewed-by: Franky Lin --- drivers/staging/brcm80211/brcmfmac/dhd.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h index 9b27982..55cbd8a 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd.h +++ b/drivers/staging/brcm80211/brcmfmac/dhd.h @@ -136,8 +136,6 @@ struct dhd_info; #define DOT11_BSSTYPE_ANY 2 #define DOT11_MAX_DEFAULT_KEYS 4 -#define BCM_MSG_IFNAME_MAX 16 - #define WLC_EVENT_MSG_LINK 0x01 #define WLC_EVENT_MSG_FLUSHTXQ 0x02 #define WLC_EVENT_MSG_GROUP 0x04 @@ -151,7 +149,7 @@ typedef struct { u32 auth_type; u32 datalen; u8 addr[ETH_ALEN]; - char ifname[BCM_MSG_IFNAME_MAX]; + char ifname[IFNAMSIZ]; } __attribute__((packed)) wl_event_msg_t; typedef struct bcmeth_hdr {