diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-02-15 22:00:41 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 10:58:07 -0800 |
| commit | a9052bc9b3bc7140325a5e936ede4e1f92037c1b (patch) | |
| tree | 4cf8edf7fdff05077abdce2ec6f80bf4f21915f1 | |
| parent | bf1c820fcbdf3bb23c4846bdb48a191e710cb841 (diff) | |
staging: vt6656: Remove typedef _VIA_BB_TYPE
BB_TYPE_11* are already defined in baseband.h as macros.
assign variable as u8 type.
iwctl.c needs the baseband.h header for the macros.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6656/device.h | 10 | ||||
| -rw-r--r-- | drivers/staging/vt6656/iwctl.c | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index c195a9c8f1f1..ec20b14948df 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -213,14 +213,6 @@ typedef struct { bool bInUse; } INT_BUFFER, *PINT_BUFFER; -/* 0:11A 1:11B 2:11G */ -typedef enum _VIA_BB_TYPE -{ - BB_TYPE_11A = 0, - BB_TYPE_11B, - BB_TYPE_11G -} VIA_BB_TYPE, *PVIA_BB_TYPE; - /*++ NDIS related */ typedef enum __DEVICE_NDIS_STATUS { @@ -540,7 +532,7 @@ struct vnt_private { u8 byCWMaxMin; /* Rate */ - VIA_BB_TYPE byBBType; /* 0: 11A, 1:11B, 2:11G */ + u8 byBBType; /* 0: 11A, 1:11B, 2:11G */ u8 byPacketType; /* 0:11a 1:11b 2:11gb 3:11ga */ u16 wBasicRate; u8 byACKRate; diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c index 23320cca93d4..60264a655f24 100644 --- a/drivers/staging/vt6656/iwctl.c +++ b/drivers/staging/vt6656/iwctl.c @@ -41,6 +41,7 @@ #include "wpactl.h" #include "control.h" #include "rndis.h" +#include "baseband.h" static const long frequency_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484, |