Signed-off-by: Michalis Pappas <mpappas@xxxxxxxxxxx> --- drivers/staging/gdm72xx/gdm_wimax.c | 10 +++------- drivers/staging/gdm72xx/hci.h | 6 ++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c index 63a760b..1fc64a9 100644 --- a/drivers/staging/gdm72xx/gdm_wimax.c +++ b/drivers/staging/gdm72xx/gdm_wimax.c @@ -600,10 +600,6 @@ static void gdm_wimax_prepare_device(struct net_device *dev) u16 len = 0; u32 val = 0; - #define BIT_MULTI_CS 0 - #define BIT_WIMAX 1 - #define BIT_QOS 2 - #define BIT_AGGREGATION 3 /* GetInformation mac address */ len = 0; @@ -612,12 +608,12 @@ static void gdm_wimax_prepare_device(struct net_device *dev) hci->length = H2B(len); gdm_wimax_send(nic, hci, HCI_HEADER_SIZE+len); - val = (1<<BIT_WIMAX) | (1<<BIT_MULTI_CS); + val = (1 << T_CAPABILITY_BIT_WIMAX) | (1 << T_CAPABILITY_BIT_MULTI_CS); #if defined(CONFIG_WIMAX_GDM72XX_QOS) - val |= (1<<BIT_QOS); + val |= (1 << T_CAPABILITY_BIT_QOS); #endif #if defined(CONFIG_WIMAX_GDM72XX_WIMAX2) - val |= (1<<BIT_AGGREGATION); + val |= (1 << T_CAPABILITY_BIT_AGGREGATION); #endif /* Set capability */ diff --git a/drivers/staging/gdm72xx/hci.h b/drivers/staging/gdm72xx/hci.h index 059ba00..0cdd1fc 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_BIT_MULTI_CS 0 +#define T_CAPABILITY_BIT_WIMAX 1 +#define T_CAPABILITY_BIT_QOS 2 +#define T_CAPABILITY_BIT_AGGREGATION 3 + struct hci_s { unsigned short cmd_evt; unsigned short length; -- 1.8.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel