diff options
| author | Michalis Pappas <mpappas@fastmail.fm> | 2014-07-09 20:21:21 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-09 21:16:52 -0700 |
| commit | 7ba58220ee2d305de89d725c19de351898f8ed06 (patch) | |
| tree | 10e27e5b132abf04a2b2084ee7bd2e0a77f93295 /drivers/staging | |
| parent | bdf4d4f23b17a0f0fe687ac709bbeb6536bd27c0 (diff) | |
| download | op-kernel-dev-7ba58220ee2d305de89d725c19de351898f8ed06.zip op-kernel-dev-7ba58220ee2d305de89d725c19de351898f8ed06.tar.gz | |
staging: gdm72xx: move T_CAPABILITY definitions to hci.h
Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/gdm72xx/gdm_wimax.c | 11 | ||||
| -rw-r--r-- | drivers/staging/gdm72xx/hci.h | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c index 0f71d41..1693cc0 100644 --- a/drivers/staging/gdm72xx/gdm_wimax.c +++ b/drivers/staging/gdm72xx/gdm_wimax.c @@ -591,11 +591,6 @@ static void gdm_wimax_prepare_device(struct net_device *dev) u32 val = 0; __be32 val_be32; - #define BIT_MULTI_CS 0 - #define BIT_WIMAX 1 - #define BIT_QOS 2 - #define BIT_AGGREGATION 3 - /* GetInformation mac address */ len = 0; hci->cmd_evt = cpu_to_be16(WIMAX_GET_INFO); @@ -603,12 +598,12 @@ static void gdm_wimax_prepare_device(struct net_device *dev) hci->length = cpu_to_be16(len); gdm_wimax_send(nic, hci, HCI_HEADER_SIZE+len); - val = (1<<BIT_WIMAX) | (1<<BIT_MULTI_CS); + val = T_CAPABILITY_WIMAX | T_CAPABILITY_MULTI_CS; #if defined(CONFIG_WIMAX_GDM72XX_QOS) - val |= (1<<BIT_QOS); + val |= T_CAPABILITY_QOS; #endif #if defined(CONFIG_WIMAX_GDM72XX_WIMAX2) - val |= (1<<BIT_AGGREGATION); + val |= T_CAPABILITY_AGGREGATION; #endif /* Set capability */ diff --git a/drivers/staging/gdm72xx/hci.h b/drivers/staging/gdm72xx/hci.h index dd2931d..10a6bfa 100644 --- a/drivers/staging/gdm72xx/hci.h +++ b/drivers/staging/gdm72xx/hci.h @@ -198,6 +198,12 @@ #define T_FFTSIZE (0xda | (4 << 16)) #define T_DUPLEX_MODE (0xdb | (4 << 16)) +/* T_CAPABILITY */ +#define T_CAPABILITY_MULTI_CS (1 << 0) +#define T_CAPABILITY_WIMAX (1 << 1) +#define T_CAPABILITY_QOS (1 << 2) +#define T_CAPABILITY_AGGREGATION (1 << 3) + struct hci_s { __be16 cmd_evt; __be16 length; |
