From: Michalis Pappas <mpappas@fastmail.fm>
To: gregkh@linuxfoundation.org
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
dan.carpenter@oracle.com, benchan@chromium.org
Subject: [PATCH v3] staging: gdm72xx: move T_CAPABILITY definitions to hci.h
Date: Wed, 9 Jul 2014 19:31:22 +0100 [thread overview]
Message-ID: <1404930682-32298-1-git-send-email-mpappas@fastmail.fm> (raw)
In-Reply-To: <53BD88C5.90606@fastmail.fm>
Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>
---
drivers/staging/gdm72xx/gdm_wimax.c | 11 +++--------
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 4148013..5748d39 100644
--- a/drivers/staging/gdm72xx/gdm_wimax.c
+++ b/drivers/staging/gdm72xx/gdm_wimax.c
@@ -609,11 +609,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;
hci->cmd_evt = H2B(WIMAX_GET_INFO);
@@ -621,12 +616,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 = 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 059ba00..4dd253d 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 {
unsigned short cmd_evt;
unsigned short length;
--
1.8.4
next prev parent reply other threads:[~2014-07-09 18:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-01 13:00 [PATCH] staging: gdm72xx: remove unused code Michalis Pappas
2014-07-01 13:00 ` [PATCH] staging: gdm72xx: conditionally compile debug code Michalis Pappas
[not found] ` <CAC5Y2nPGyByqLEM1Go6Pxpb6MhiJy2Fvu=eEz6ak24gMhayk=A@mail.gmail.com>
2014-07-01 16:40 ` Michalis Pappas
[not found] ` <CAC5Y2nOvJ2=u7-T53kHd50AfQ7Mo_U4qvD_=si9=NSr_q0w3NA@mail.gmail.com>
2014-07-03 17:27 ` Michalis Pappas
2014-07-09 18:51 ` Greg KH
2014-07-09 19:52 ` Michalis Pappas
2014-07-09 20:24 ` Greg KH
2014-07-16 20:40 ` Michalis Pappas
2014-07-16 20:50 ` Greg KH
2014-07-16 22:03 ` Michalis Pappas
2014-07-16 22:10 ` Greg KH
2014-07-16 22:46 ` Joe Perches
2014-07-16 22:57 ` Greg KH
2014-07-17 0:19 ` Joe Perches
2014-07-01 13:00 ` [PATCH] staging: gdm72xx: move T_CAPABILITY bit definitions to hci.h Michalis Pappas
2014-07-01 15:37 ` Ben Chan
2014-07-01 16:25 ` Michalis Pappas
2014-07-02 10:18 ` [PATCH V2] staging: gdm72xx: move T_CAPABILITY " Michalis Pappas
2014-07-09 10:26 ` Dan Carpenter
2014-07-09 18:24 ` Michalis Pappas
2014-07-09 18:31 ` Michalis Pappas [this message]
2014-07-09 18:57 ` [PATCH v3] " Greg KH
2014-07-09 19:21 ` [PATCH v4] " Michalis Pappas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1404930682-32298-1-git-send-email-mpappas@fastmail.fm \
--to=mpappas@fastmail.fm \
--cc=benchan@chromium.org \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).