Return-path: Received: from mail-wi0-f172.google.com ([209.85.212.172]:50226 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752261AbaJYTzp (ORCPT ); Sat, 25 Oct 2014 15:55:45 -0400 Received: by mail-wi0-f172.google.com with SMTP id d1so20800wiv.11 for ; Sat, 25 Oct 2014 12:55:44 -0700 (PDT) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, forest@alittletooquiet.net, Malcolm Priestley Subject: [PATCH 30/48] staging: vt6655: move all RATE_* macros to device.h Date: Sat, 25 Oct 2014 09:40:08 +0100 Message-Id: <1414226426-5811-31-git-send-email-tvboxspy@gmail.com> (sfid-20141025_215548_339364_3F138AB5) In-Reply-To: <1414226426-5811-1-git-send-email-tvboxspy@gmail.com> References: <1414226426-5811-1-git-send-email-tvboxspy@gmail.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: Signed-off-by: Malcolm Priestley --- drivers/staging/vt6655/device.h | 15 +++++++++++++++ drivers/staging/vt6655/vntwifi.h | 14 -------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index fa2d49c..e97a0d2 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -84,6 +84,21 @@ /*--------------------- Export Definitions -------------------------*/ +#define RATE_1M 0 +#define RATE_2M 1 +#define RATE_5M 2 +#define RATE_11M 3 +#define RATE_6M 4 +#define RATE_9M 5 +#define RATE_12M 6 +#define RATE_18M 7 +#define RATE_24M 8 +#define RATE_36M 9 +#define RATE_48M 10 +#define RATE_54M 11 +#define RATE_AUTO 12 +#define MAX_RATE 12 + #define MAC_MAX_CONTEXT_REG (256+128) #define MAX_MULTICAST_ADDRESS_NUM 32 diff --git a/drivers/staging/vt6655/vntwifi.h b/drivers/staging/vt6655/vntwifi.h index ad180e0..2ba7713 100644 --- a/drivers/staging/vt6655/vntwifi.h +++ b/drivers/staging/vt6655/vntwifi.h @@ -35,20 +35,6 @@ #include "card.h" /*--------------------- Export Definitions -------------------------*/ -#define RATE_1M 0 -#define RATE_2M 1 -#define RATE_5M 2 -#define RATE_11M 3 -#define RATE_6M 4 -#define RATE_9M 5 -#define RATE_12M 6 -#define RATE_18M 7 -#define RATE_24M 8 -#define RATE_36M 9 -#define RATE_48M 10 -#define RATE_54M 11 -#define RATE_AUTO 12 -#define MAX_RATE 12 // key CipherSuite #define KEY_CTL_WEP 0x00 -- 1.9.1