[PATCH v2 00/62] staging: wlan-ng: coding style changes/cleanups
Switch to all-upper or all-lower (for function-style) case names for macros in p80211metadef.h to silence checkpatch messages and match the coding guidelines. Shorten names that have repeated elements. Rejoin lines split to keep within 80 characters that now fit due to shortened names. Make the use of braced blocks in switch cases consistent across the driver by always using K&R style, braces at the case level and a single indent. Rejoin split lines that now fit within 80 characters due to reduced indentation. Cleanup unneeded braces on a single line if statement. Remove the comments stating that p80211metadef.h and p80211metastruct.h are automatically generated and should not be edited; neither file has a mechanism for generation and both have been manually edited and updated in version control multiple times. Patches should be applied in order as there are some dependencies. Changes since v1: - drop removal of redundant code commented out with #if 0 (already applied) - split renaming changes for macros in p80211metadef.h into one patch per identifier, as suggested by GregKH, and to make all changes to each name in 1 step, as suggested by Dan Carpenter Tim Collier (62): staging: wlan-ng: rename DIDmsg_dot11req_mibget in p80211metadef.h staging: wlan-ng: rename DIDmsg_dot11req_mibget_mibattribute in p80211metadef.h staging: wlan-ng: rename DIDmsg_dot11req_mibget_resultcode in p80211metadef.h staging: wlan-ng: rename DIDmsg_dot11req_mibset in p80211metadef.h staging: wlan-ng: rename DIDmsg_dot11req_mibset_mibattribute in p80211metadef.h staging: wlan-ng: rename DIDmsg_dot11req_mibset_resultcode in p80211metadef.h staging: wlan-ng: rename DIDmsg_dot11req_scan in p80211metadef.h staging: wlan-ng: rename DIDmsg_dot11req_scan_results in p80211metadef.h staging: wlan-ng: rename DIDmsg_dot11req_start in p80211metadef.h staging: wlan-ng: rename DIDmsg_dot11ind_authenticate in p80211metadef.h staging: wlan-ng: rename DIDmsg_lnxreq_ifstate in p80211metadef.h staging: wlan-ng: rename DIDmsg_lnxreq_wlansniff in p80211metadef.h staging: wlan-ng: rename DIDmsg_lnxreq_hostwep in p80211metadef.h staging: wlan-ng: rename DIDmsg_lnxreq_commsquality in p80211metadef.h staging: wlan-ng: rename DIDmsg_lnxreq_autojoin in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_readpda in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_readpda_pda in p80211metadef.h staging: wlan-ng: rename DIDmsg_dot11ind_associate in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_readpda_resultcode in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_ramdl_state in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_ramdl_state_enable in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_ramdl_state_exeaddr in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_ramdl_state_resultcode in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_ramdl_write in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_ramdl_write_addr in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_ramdl_write_len in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_ramdl_write_data in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_ramdl_write_resultcode in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_flashdl_state in p80211metadef.h staging: wlan-ng: rename DIDmsg_p2req_flashdl_write in p80211metadef.h staging: wlan-ng: rename DIDmib_cat_dot11smt in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11smt_dot11WEPDefaultKeysTable in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11smt_dot11WEPDefaultKeysTable_key in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11smt_dot11PrivacyTable in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable_dot11MACAddress in p80211metadef.h staging: wlan-ng: DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold in p80211metadef.h staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime in p80211metadef.h staging: wlan-ng: rename DIDmib_cat_dot11phy in p80211metadef.h staging:
[PATCH v2 05/62] staging: wlan-ng: rename DIDmsg_dot11req_mibset_mibattribute in p80211metadef.h
Rename DIDmsg_dot11req_mibset_mibattribute in p80211metadef.h to DIDMSG_DOT11REQ_MIBSET_MIBATTRIBUTE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/p80211netdev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 520ee658aa1a..e28244bb6a52 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -62,7 +62,7 @@ #define DIDMSG_DOT11REQ_MIBSET \ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(2)) -#define DIDmsg_dot11req_mibset_mibattribute \ +#define DIDMSG_DOT11REQ_MIBSET_MIBATTRIBUTE \ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(2) | \ P80211DID_MKITEM(1) | 0x) diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index 9a563e5829be..1062e07fe505 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c @@ -645,7 +645,7 @@ static int p80211knetdev_set_mac_address(struct net_device *dev, void *addr) WLAN_DEVNAMELEN_MAX - 1); /* Set up the mibattribute argument */ - mibattr->did = DIDmsg_dot11req_mibset_mibattribute; + mibattr->did = DIDMSG_DOT11REQ_MIBSET_MIBATTRIBUTE; mibattr->status = P80211ENUM_msgitem_status_data_ok; mibattr->len = sizeof(mibattr->data); -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 12/62] staging: wlan-ng: rename DIDmsg_lnxreq_wlansniff in p80211metadef.h
Rename DIDmsg_lnxreq_wlansniff in p80211metadef.h to
DIDMSG_LNXREQ_WLANSNIFF to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 294a728e0f6d..c9f8f2681cf8 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -88,7 +88,7 @@
#define DIDMSG_LNXREQ_IFSTATE \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(1))
-#define DIDmsg_lnxreq_wlansniff \
+#define DIDMSG_LNXREQ_WLANSNIFF \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(2))
#define DIDmsg_lnxreq_hostwep \
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index b4e23018bfc2..c755d4db432b 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -351,7 +351,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
result = 0;
}
break;
- case DIDmsg_lnxreq_wlansniff:
+ case DIDMSG_LNXREQ_WLANSNIFF:
pr_debug("Received mlme wlansniff request\n");
result = prism2mgmt_wlansniff(wlandev, msg);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 20/62] staging: wlan-ng: rename DIDmsg_p2req_ramdl_state in p80211metadef.h
Rename DIDmsg_p2req_ramdl_state to DIDMSG_P2REQ_RAMDL_STATE in
p80211metadef.h to fix "Avoid CamelCase" message from checkpatch and
conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2fw.c | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 945fb16d2f7e..0ad3760bf779 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -111,7 +111,7 @@
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(2) | \
P80211DID_MKITEM(2) | 0x)
-#define DIDmsg_p2req_ramdl_state \
+#define DIDMSG_P2REQ_RAMDL_STATE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(11))
#define DIDmsg_p2req_ramdl_state_enable \
diff --git a/drivers/staging/wlan-ng/prism2fw.c
b/drivers/staging/wlan-ng/prism2fw.c
index d8f66dd13fc8..37f63988d5c9 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -1021,7 +1021,7 @@ static int writeimage(struct wlandevice *wlandev, struct
imgchunk *fchunk,
/* Initialize the messages */
strcpy(rstmsg->devname, wlandev->name);
- rstmsg->msgcode = DIDmsg_p2req_ramdl_state;
+ rstmsg->msgcode = DIDMSG_P2REQ_RAMDL_STATE;
rstmsg->msglen = sizeof(*rstmsg);
rstmsg->enable.did = DIDmsg_p2req_ramdl_state_enable;
rstmsg->exeaddr.did = DIDmsg_p2req_ramdl_state_exeaddr;
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index a035aac0a243..a0952819c852 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -315,7 +315,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received mlme readpda request\n");
result = prism2mgmt_readpda(wlandev, msg);
break;
- case DIDmsg_p2req_ramdl_state:
+ case DIDMSG_P2REQ_RAMDL_STATE:
pr_debug("Received mlme ramdl_state request\n");
result = prism2mgmt_ramdl_state(wlandev, msg);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 19/62] staging: wlan-ng: rename DIDmsg_p2req_readpda_resultcode in p80211metadef.h
Rename DIDmsg_p2req_readpda_resultcode in p80211metadef.h to DIDMSG_P2REQ_READPDA_RESULTCODE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 18190e03015c..945fb16d2f7e 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -107,7 +107,7 @@ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(2) | \ P80211DID_MKITEM(1) | 0x) -#define DIDmsg_p2req_readpda_resultcode \ +#define DIDMSG_P2REQ_READPDA_RESULTCODE \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(2) | \ P80211DID_MKITEM(2) | 0x) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index f85e2fea4544..d8f66dd13fc8 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -793,7 +793,7 @@ static int read_cardpda(struct pda *pda, struct wlandevice *wlandev) msg->pda.did = DIDMSG_P2REQ_READPDA_PDA; msg->pda.len = HFA384x_PDA_LEN_MAX; msg->pda.status = P80211ENUM_msgitem_status_no_value; - msg->resultcode.did = DIDmsg_p2req_readpda_resultcode; + msg->resultcode.did = DIDMSG_P2REQ_READPDA_RESULTCODE; msg->resultcode.len = sizeof(u32); msg->resultcode.status = P80211ENUM_msgitem_status_no_value; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 16/62] staging: wlan-ng: rename DIDmsg_p2req_readpda in p80211metadef.h
Rename DIDmsg_p2req_readpda in p80211metadef.h to DIDMSG_P2REQ_READPDA
to fix "Avoid CamelCase" message from checkpatch and conform to the
coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2fw.c | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index a217dc7dfcfc..16b4a57ffd40 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -100,7 +100,7 @@
#define DIDMSG_LNXREQ_AUTOJOIN \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(5))
-#define DIDmsg_p2req_readpda \
+#define DIDMSG_P2REQ_READPDA \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(2))
#define DIDmsg_p2req_readpda_pda \
diff --git a/drivers/staging/wlan-ng/prism2fw.c
b/drivers/staging/wlan-ng/prism2fw.c
index 511cf5efca63..b33eac4dd57e 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -787,7 +787,7 @@ static int read_cardpda(struct pda *pda, struct wlandevice
*wlandev)
return -ENOMEM;
/* set up the msg */
- msg->msgcode = DIDmsg_p2req_readpda;
+ msg->msgcode = DIDMSG_P2REQ_READPDA;
msg->msglen = sizeof(msg);
strcpy(msg->devname, wlandev->name);
msg->pda.did = DIDmsg_p2req_readpda_pda;
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index 3fef888d34a7..a035aac0a243 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -311,7 +311,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
/*
* Prism2 specific messages
*/
- case DIDmsg_p2req_readpda:
+ case DIDMSG_P2REQ_READPDA:
pr_debug("Received mlme readpda request\n");
result = prism2mgmt_readpda(wlandev, msg);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 02/62] staging: wlan-ng: rename DIDmsg_dot11req_mibget_mibattribute in p80211metadef.h
Rename DIDmsg_dot11req_mibget_mibattribute in p80211metadef.h to DIDMSG_DOT11REQ_MIBGET_MIBATTRIBUTE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 2a82f1d9b7f7..c7fa33e86ffc 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -51,7 +51,7 @@ #define DIDMSG_DOT11REQ_MIBGET \ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(1)) -#define DIDmsg_dot11req_mibget_mibattribute \ +#define DIDMSG_DOT11REQ_MIBGET_MIBATTRIBUTE \ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(1) | \ P80211DID_MKITEM(1) | 0x) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index 375e30f34041..a2939969f0f7 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -298,7 +298,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr, getmsg.msglen = sizeof(getmsg); strcpy(getmsg.devname, wlandev->name); - getmsg.mibattribute.did = DIDmsg_dot11req_mibget_mibattribute; + getmsg.mibattribute.did = DIDMSG_DOT11REQ_MIBGET_MIBATTRIBUTE; getmsg.mibattribute.status = P80211ENUM_msgitem_status_data_ok; getmsg.resultcode.did = DIDmsg_dot11req_mibget_resultcode; getmsg.resultcode.status = P80211ENUM_msgitem_status_no_value; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 13/62] staging: wlan-ng: rename DIDmsg_lnxreq_hostwep in p80211metadef.h
Rename DIDmsg_lnxreq_hostwep in p80211metadef.h to
DIDMSG_LNXREQ_HOSTWEP to fix "Avoid CamelCase" message from checkpatch
and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/p80211req.c | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index c9f8f2681cf8..2cda010322f4 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -91,7 +91,7 @@
#define DIDMSG_LNXREQ_WLANSNIFF \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(2))
-#define DIDmsg_lnxreq_hostwep \
+#define DIDMSG_LNXREQ_HOSTWEP \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(3))
#define DIDmsg_lnxreq_commsquality \
diff --git a/drivers/staging/wlan-ng/p80211req.c
b/drivers/staging/wlan-ng/p80211req.c
index 665c48fb168c..cab577533767 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -172,7 +172,7 @@ static void p80211req_handlemsg(struct wlandevice *wlandev,
struct p80211msg *msg)
{
switch (msg->msgcode) {
- case DIDmsg_lnxreq_hostwep:{
+ case DIDMSG_LNXREQ_HOSTWEP:{
struct p80211msg_lnxreq_hostwep *req =
(struct p80211msg_lnxreq_hostwep *)msg;
wlandev->hostwep &=
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index c755d4db432b..ae6a99bf3cab 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -334,7 +334,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
/*
* Linux specific messages
*/
- case DIDmsg_lnxreq_hostwep:
+ case DIDMSG_LNXREQ_HOSTWEP:
break; /* ignore me. */
case DIDMSG_LNXREQ_IFSTATE:
{
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 01/62] staging: wlan-ng: rename DIDmsg_dot11req_mibget in p80211metadef.h
Rename DIDmsg_dot11req_mibget in p80211metadef.h to
DIDMSG_DOT11REQ_MIBGET to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 2 +-
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/p80211req.c | 6 +++---
drivers/staging/wlan-ng/prism2fw.c | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index d4cf09b11e33..c1cfbbbe5da3 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -618,7 +618,7 @@ static int prism2_get_tx_power(struct wiphy *wiphy, struct
wireless_dev *wdev,
int err = 0;
mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data;
- msg.msgcode = DIDmsg_dot11req_mibget;
+ msg.msgcode = DIDMSG_DOT11REQ_MIBGET;
mibitem->did =
DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index e63b4b557d0a..2a82f1d9b7f7 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -48,7 +48,7 @@
#ifndef _P80211MKMETADEF_H
#define _P80211MKMETADEF_H
-#define DIDmsg_dot11req_mibget \
+#define DIDMSG_DOT11REQ_MIBGET \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(1))
#define DIDmsg_dot11req_mibget_mibattribute \
diff --git a/drivers/staging/wlan-ng/p80211req.c
b/drivers/staging/wlan-ng/p80211req.c
index c36d01469afc..45c5a8eca33f 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -125,7 +125,7 @@ int p80211req_dorequest(struct wlandevice *wlandev, u8
*msgbuf)
/* Check Permissions */
if (!capable(CAP_NET_ADMIN) &&
- (msg->msgcode != DIDmsg_dot11req_mibget)) {
+ (msg->msgcode != DIDMSG_DOT11REQ_MIBGET)) {
netdev_err(wlandev->netdev,
"%s: only dot11req_mibget allowed for non-root.\n",
wlandev->name);
@@ -184,9 +184,9 @@ static void p80211req_handlemsg(struct wlandevice *wlandev,
break;
}
- case DIDmsg_dot11req_mibget:
+ case DIDMSG_DOT11REQ_MIBGET:
case DIDmsg_dot11req_mibset:{
- int isget = (msg->msgcode == DIDmsg_dot11req_mibget);
+ int isget = (msg->msgcode == DIDMSG_DOT11REQ_MIBGET);
struct p80211msg_dot11req_mibget *mib_msg =
(struct p80211msg_dot11req_mibget *)msg;
p80211req_mibset_mibget(wlandev, mib_msg, isget);
diff --git a/drivers/staging/wlan-ng/prism2fw.c
b/drivers/staging/wlan-ng/prism2fw.c
index ddcaac648bd5..375e30f34041 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -294,7 +294,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr,
/* read the card's PRI-SUP */
memset(&getmsg, 0, sizeof(getmsg));
- getmsg.msgcode = DIDmsg_dot11req_mibget;
+ getmsg.msgcode = DIDMSG_DOT11REQ_MIBGET;
getmsg.msglen = sizeof(getmsg);
strcpy(getmsg.devname, wlandev->name);
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index e88baf715cec..8cf6ead518ea 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -301,7 +301,7 @@ int prism2mgmt_mibset_mibget(struct wlandevice *wlandev,
void *msgp)
** this is a "mibset" so make make sure that the MIB may be written.
*/
- isget = (msg->msgcode == DIDmsg_dot11req_mibget);
+ isget = (msg->msgcode == DIDMSG_DOT11REQ_MIBGET);
if (isget) {
if (!(mib->flag & F_READ)) {
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index 914970249680..78a4875e0a73 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -288,7 +288,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
int result = 0;
switch (msg->msgcode) {
- case DIDmsg_dot11req_mibget:
+ case DIDMSG_DOT11REQ_MIBGET:
pr_debug("Received mibget request\n");
result = prism2mgmt_mibset_mibget(wlandev, msg);
break;
@@ -1949,7 +1949,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
}
/* Get the signal rate */
- msg.msgcode = DIDmsg_dot11req_mibget;
+ msg.msgcode = DIDMSG_DOT11REQ_MIBGET;
mibitem->did = DIDmib_p2_p2MAC_p2CurrentTxRate;
result = p80211req_dorequest(w
[PATCH v2 15/62] staging: wlan-ng: rename DIDmsg_lnxreq_autojoin in p80211metadef.h
Rename DIDmsg_lnxreq_autojoin in p80211metadef.h to
DIDMSG_LNXREQ_AUTOJOIN to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 4 ++--
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 2622635945db..8bc7a4c31d6c 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -533,7 +533,7 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
/* Now do the actual join. Note there is no way that I can
* see to request a specific bssid
*/
- msg_join.msgcode = DIDmsg_lnxreq_autojoin;
+ msg_join.msgcode = DIDMSG_LNXREQ_AUTOJOIN;
memcpy(msg_join.ssid.data.data, sme->ssid, length);
msg_join.ssid.data.len = length;
@@ -556,7 +556,7 @@ static int prism2_disconnect(struct wiphy *wiphy, struct
net_device *dev,
int err = 0;
/* Do a join, with a bogus ssid. Thats the only way I can think of */
- msg_join.msgcode = DIDmsg_lnxreq_autojoin;
+ msg_join.msgcode = DIDMSG_LNXREQ_AUTOJOIN;
memcpy(msg_join.ssid.data.data, "---", 3);
msg_join.ssid.data.len = 3;
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 14c5500799a3..a217dc7dfcfc 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -97,7 +97,7 @@
#define DIDMSG_LNXREQ_COMMSQUALITY \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(4))
-#define DIDmsg_lnxreq_autojoin \
+#define DIDMSG_LNXREQ_AUTOJOIN \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(5))
#define DIDmsg_p2req_readpda \
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index 6ca444c5bb59..3fef888d34a7 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -355,7 +355,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received mlme wlansniff request\n");
result = prism2mgmt_wlansniff(wlandev, msg);
break;
- case DIDmsg_lnxreq_autojoin:
+ case DIDMSG_LNXREQ_AUTOJOIN:
pr_debug("Received mlme autojoin request\n");
result = prism2mgmt_autojoin(wlandev, msg);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 10/62] staging: wlan-ng: rename DIDmsg_dot11ind_authenticate in p80211metadef.h
Rename DIDmsg_dot11ind_authenticate in p80211metadef.h to DIDMSG_DOT11IND_AUTHENTICATE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index a8be12c5a905..671eeeb33e4e 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -79,7 +79,7 @@ #define DIDMSG_DOT11REQ_START \ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(13)) -#define DIDmsg_dot11ind_authenticate \ +#define DIDMSG_DOT11IND_AUTHENTICATE \ (P80211DID_MKSECTION(2) | \ P80211DID_MKGROUP(1)) #define DIDmsg_dot11ind_associate \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 03/62] staging: wlan-ng: rename DIDmsg_dot11req_mibget_resultcode in p80211metadef.h
Rename DIDmsg_dot11req_mibget_resultcode in p80211metadef.h to DIDMSG_DOT11REQ_MIBGET_RESULTCODE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index c7fa33e86ffc..cee0bee4a092 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -55,7 +55,7 @@ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(1) | \ P80211DID_MKITEM(1) | 0x) -#define DIDmsg_dot11req_mibget_resultcode \ +#define DIDMSG_DOT11REQ_MIBGET_RESULTCODE \ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(1) | \ P80211DID_MKITEM(2) | 0x) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index a2939969f0f7..511cf5efca63 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -300,7 +300,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr, getmsg.mibattribute.did = DIDMSG_DOT11REQ_MIBGET_MIBATTRIBUTE; getmsg.mibattribute.status = P80211ENUM_msgitem_status_data_ok; - getmsg.resultcode.did = DIDmsg_dot11req_mibget_resultcode; + getmsg.resultcode.did = DIDMSG_DOT11REQ_MIBGET_RESULTCODE; getmsg.resultcode.status = P80211ENUM_msgitem_status_no_value; item = (struct p80211itemd *)getmsg.mibattribute.data; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 25/62] staging: wlan-ng: rename DIDmsg_p2req_ramdl_write_addr in p80211metadef.h
Rename DIDmsg_p2req_ramdl_write_addr in p80211metadef.h to DIDMSG_P2REQ_RAMDL_WRITE_ADDR to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 0b56cfc45872..bdd2bc754659 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -129,7 +129,7 @@ #define DIDMSG_P2REQ_RAMDL_WRITE \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(12)) -#define DIDmsg_p2req_ramdl_write_addr \ +#define DIDMSG_P2REQ_RAMDL_WRITE_ADDR \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(12) | \ P80211DID_MKITEM(1) | 0x) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index 55c9b58082c7..067bcf2af3fc 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -1036,7 +1036,7 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk, strcpy(rwrmsg->devname, wlandev->name); rwrmsg->msgcode = DIDMSG_P2REQ_RAMDL_WRITE; rwrmsg->msglen = sizeof(*rwrmsg); - rwrmsg->addr.did = DIDmsg_p2req_ramdl_write_addr; + rwrmsg->addr.did = DIDMSG_P2REQ_RAMDL_WRITE_ADDR; rwrmsg->len.did = DIDmsg_p2req_ramdl_write_len; rwrmsg->data.did = DIDmsg_p2req_ramdl_write_data; rwrmsg->resultcode.did = DIDmsg_p2req_ramdl_write_resultcode; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 04/62] staging: wlan-ng: rename DIDmsg_dot11req_mibset in p80211metadef.h
Rename DIDmsg_dot11req_mibset in p80211metadef.h to
DIDMSG_DOT11REQ_MIBSET to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 4 ++--
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/p80211netdev.c | 2 +-
drivers/staging/wlan-ng/p80211req.c | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index c1cfbbbe5da3..8a51dec36bea 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -76,7 +76,7 @@ static int prism2_domibset_uint32(struct wlandevice *wlandev,
u32 did, u32 data)
struct p80211item_uint32 *mibitem =
(struct p80211item_uint32 *)&msg.mibattribute.data;
- msg.msgcode = DIDmsg_dot11req_mibset;
+ msg.msgcode = DIDMSG_DOT11REQ_MIBSET;
mibitem->did = did;
mibitem->data = data;
@@ -90,7 +90,7 @@ static int prism2_domibset_pstr32(struct wlandevice *wlandev,
struct p80211item_pstr32 *mibitem =
(struct p80211item_pstr32 *)&msg.mibattribute.data;
- msg.msgcode = DIDmsg_dot11req_mibset;
+ msg.msgcode = DIDMSG_DOT11REQ_MIBSET;
mibitem->did = did;
mibitem->data.len = len;
memcpy(mibitem->data.data, data, len);
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index cee0bee4a092..520ee658aa1a 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -59,7 +59,7 @@
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(2) | 0x)
-#define DIDmsg_dot11req_mibset \
+#define DIDMSG_DOT11REQ_MIBSET \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(2))
#define DIDmsg_dot11req_mibset_mibattribute \
diff --git a/drivers/staging/wlan-ng/p80211netdev.c
b/drivers/staging/wlan-ng/p80211netdev.c
index ae98ac1dd434..9a563e5829be 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -638,7 +638,7 @@ static int p80211knetdev_set_mac_address(struct net_device
*dev, void *addr)
/* Set up a dot11req_mibset */
memset(&dot11req, 0, sizeof(dot11req));
- dot11req.msgcode = DIDmsg_dot11req_mibset;
+ dot11req.msgcode = DIDMSG_DOT11REQ_MIBSET;
dot11req.msglen = sizeof(dot11req);
memcpy(dot11req.devname,
((struct wlandevice *)dev->ml_priv)->name,
diff --git a/drivers/staging/wlan-ng/p80211req.c
b/drivers/staging/wlan-ng/p80211req.c
index 45c5a8eca33f..0f7253234c95 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -185,7 +185,7 @@ static void p80211req_handlemsg(struct wlandevice *wlandev,
break;
}
case DIDMSG_DOT11REQ_MIBGET:
- case DIDmsg_dot11req_mibset:{
+ case DIDMSG_DOT11REQ_MIBSET:{
int isget = (msg->msgcode == DIDMSG_DOT11REQ_MIBGET);
struct p80211msg_dot11req_mibget *mib_msg =
(struct p80211msg_dot11req_mibget *)msg;
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index 78a4875e0a73..a25546888cca 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -292,7 +292,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received mibget request\n");
result = prism2mgmt_mibset_mibget(wlandev, msg);
break;
- case DIDmsg_dot11req_mibset:
+ case DIDMSG_DOT11REQ_MIBSET:
pr_debug("Received mibset request\n");
result = prism2mgmt_mibset_mibget(wlandev, msg);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 24/62] staging: wlan-ng: rename DIDmsg_p2req_ramdl_write in p80211metadef.h
Rename DIDmsg_p2req_ramdl_write in p80211metadef.h to
DIDMSG_P2REQ_RAMDL_WRITE to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2fw.c | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 98bf69d4c5d6..0b56cfc45872 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -126,7 +126,7 @@
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(11) | \
P80211DID_MKITEM(3) | 0x)
-#define DIDmsg_p2req_ramdl_write \
+#define DIDMSG_P2REQ_RAMDL_WRITE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(12))
#define DIDmsg_p2req_ramdl_write_addr \
diff --git a/drivers/staging/wlan-ng/prism2fw.c
b/drivers/staging/wlan-ng/prism2fw.c
index 9c3eb90035e6..55c9b58082c7 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -1034,7 +1034,7 @@ static int writeimage(struct wlandevice *wlandev, struct
imgchunk *fchunk,
rstmsg->resultcode.len = sizeof(u32);
strcpy(rwrmsg->devname, wlandev->name);
- rwrmsg->msgcode = DIDmsg_p2req_ramdl_write;
+ rwrmsg->msgcode = DIDMSG_P2REQ_RAMDL_WRITE;
rwrmsg->msglen = sizeof(*rwrmsg);
rwrmsg->addr.did = DIDmsg_p2req_ramdl_write_addr;
rwrmsg->len.did = DIDmsg_p2req_ramdl_write_len;
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index a0952819c852..2aae19ebe3cc 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -319,7 +319,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received mlme ramdl_state request\n");
result = prism2mgmt_ramdl_state(wlandev, msg);
break;
- case DIDmsg_p2req_ramdl_write:
+ case DIDMSG_P2REQ_RAMDL_WRITE:
pr_debug("Received mlme ramdl_write request\n");
result = prism2mgmt_ramdl_write(wlandev, msg);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 09/62] staging: wlan-ng: rename DIDmsg_dot11req_start in p80211metadef.h
Rename DIDmsg_dot11req_start in p80211metadef.h to
DIDMSG_DOT11REQ_START to fix "Avoid CamelCase" message from checkpatch
and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 69d585039ecf..a8be12c5a905 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -76,7 +76,7 @@
#define DIDMSG_DOT11REQ_SCAN_RESULTS \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(5))
-#define DIDmsg_dot11req_start \
+#define DIDMSG_DOT11REQ_START \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(13))
#define DIDmsg_dot11ind_authenticate \
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index 83af96546651..bec5cde8826a 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -304,7 +304,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received scan_results request\n");
result = prism2mgmt_scan_results(wlandev, msg);
break;
- case DIDmsg_dot11req_start:
+ case DIDMSG_DOT11REQ_START:
pr_debug("Received mlme start request\n");
result = prism2mgmt_start(wlandev, msg);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 08/62] staging: wlan-ng: rename DIDmsg_dot11req_scan_results in p80211metadef.h
Rename DIDmsg_dot11req_scan_results in p80211metadef.h to
DIDMSG_DOT11REQ_SCAN_RESULTS to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 2 +-
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index cf0cd364e609..6ca123af5c36 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -350,7 +350,7 @@ static int prism2_scan(struct wiphy *wiphy,
int freq;
memset(&msg2, 0, sizeof(msg2));
- msg2.msgcode = DIDmsg_dot11req_scan_results;
+ msg2.msgcode = DIDMSG_DOT11REQ_SCAN_RESULTS;
msg2.bssindex.data = i;
result = p80211req_dorequest(wlandev, (u8 *)&msg2);
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 06ee86683b22..69d585039ecf 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -73,7 +73,7 @@
#define DIDMSG_DOT11REQ_SCAN \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(4))
-#define DIDmsg_dot11req_scan_results \
+#define DIDMSG_DOT11REQ_SCAN_RESULTS \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(5))
#define DIDmsg_dot11req_start \
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index ada01837137f..83af96546651 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -300,7 +300,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received scan request\n");
result = prism2mgmt_scan(wlandev, msg);
break;
- case DIDmsg_dot11req_scan_results:
+ case DIDMSG_DOT11REQ_SCAN_RESULTS:
pr_debug("Received scan_results request\n");
result = prism2mgmt_scan_results(wlandev, msg);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 07/62] staging: wlan-ng: rename DIDmsg_dot11req_scan in p80211metadef.h
Rename DIDmsg_dot11req_scan in p80211metadef.h to DIDMSG_DOT11REQ_SCAN
to fix "Avoid CamelCase" message from checkpatch and conform to the
coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 2 +-
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 8a51dec36bea..cf0cd364e609 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -311,7 +311,7 @@ static int prism2_scan(struct wiphy *wiphy,
priv->scan_request = request;
memset(&msg1, 0x00, sizeof(msg1));
- msg1.msgcode = DIDmsg_dot11req_scan;
+ msg1.msgcode = DIDMSG_DOT11REQ_SCAN;
msg1.bsstype.data = P80211ENUM_bsstype_any;
memset(&msg1.bssid.data.data, 0xFF, sizeof(msg1.bssid.data.data));
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 5e99dc775c13..06ee86683b22 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -70,7 +70,7 @@
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(2) | \
P80211DID_MKITEM(2) | 0x)
-#define DIDmsg_dot11req_scan \
+#define DIDMSG_DOT11REQ_SCAN \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(4))
#define DIDmsg_dot11req_scan_results \
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index a25546888cca..ada01837137f 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -296,7 +296,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received mibset request\n");
result = prism2mgmt_mibset_mibget(wlandev, msg);
break;
- case DIDmsg_dot11req_scan:
+ case DIDMSG_DOT11REQ_SCAN:
pr_debug("Received scan request\n");
result = prism2mgmt_scan(wlandev, msg);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 11/62] staging: wlan-ng: rename DIDmsg_lnxreq_ifstate in p80211metadef.h
Rename DIDmsg_lnxreq_ifstate in p80211metadef.h to
DIDMSG_LNXREQ_IFSTATE to fix "Avoid CamelCase" message from checkpatch
and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/p80211req.c | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 671eeeb33e4e..294a728e0f6d 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -85,7 +85,7 @@
#define DIDmsg_dot11ind_associate \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3))
-#define DIDmsg_lnxreq_ifstate \
+#define DIDMSG_LNXREQ_IFSTATE \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(1))
#define DIDmsg_lnxreq_wlansniff \
diff --git a/drivers/staging/wlan-ng/p80211req.c
b/drivers/staging/wlan-ng/p80211req.c
index 0f7253234c95..665c48fb168c 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -117,7 +117,7 @@ int p80211req_dorequest(struct wlandevice *wlandev, u8
*msgbuf)
/* Check to make sure the MSD is running */
if (!((wlandev->msdstate == WLAN_MSD_HWPRESENT &&
- msg->msgcode == DIDmsg_lnxreq_ifstate) ||
+ msg->msgcode == DIDMSG_LNXREQ_IFSTATE) ||
wlandev->msdstate == WLAN_MSD_RUNNING ||
wlandev->msdstate == WLAN_MSD_FWLOAD)) {
return -ENODEV;
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index bec5cde8826a..b4e23018bfc2 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -336,7 +336,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
*/
case DIDmsg_lnxreq_hostwep:
break; /* ignore me. */
- case DIDmsg_lnxreq_ifstate:
+ case DIDMSG_LNXREQ_IFSTATE:
{
struct p80211msg_lnxreq_ifstate *ifstatemsg;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 14/62] staging: wlan-ng: rename DIDmsg_lnxreq_commsquality in p80211metadef.h
Rename DIDmsg_lnxreq_commsquality in p80211metadef.h to
DIDMSG_LNXREQ_COMMSQUALITY to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 2 +-
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 6ca123af5c36..2622635945db 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -256,7 +256,7 @@ static int prism2_get_station(struct wiphy *wiphy, struct
net_device *dev,
return -EOPNOTSUPP;
/* build request message */
- quality.msgcode = DIDmsg_lnxreq_commsquality;
+ quality.msgcode = DIDMSG_LNXREQ_COMMSQUALITY;
quality.dbm.data = P80211ENUM_truth_true;
quality.dbm.status = P80211ENUM_msgitem_status_data_ok;
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 2cda010322f4..14c5500799a3 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -94,7 +94,7 @@
#define DIDMSG_LNXREQ_HOSTWEP \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(3))
-#define DIDmsg_lnxreq_commsquality \
+#define DIDMSG_LNXREQ_COMMSQUALITY \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(4))
#define DIDmsg_lnxreq_autojoin \
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index ae6a99bf3cab..6ca444c5bb59 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -359,7 +359,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received mlme autojoin request\n");
result = prism2mgmt_autojoin(wlandev, msg);
break;
- case DIDmsg_lnxreq_commsquality:{
+ case DIDMSG_LNXREQ_COMMSQUALITY:{
struct p80211msg_lnxreq_commsquality *qualmsg;
pr_debug("Received commsquality request\n");
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 06/62] staging: wlan-ng: rename DIDmsg_dot11req_mibset_resultcode in p80211metadef.h
Rename DIDmsg_dot11req_mibset_resultcode in p80211metadef.h to DIDMSG_DOT11REQ_MIBSET_RESULTCODE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/p80211netdev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index e28244bb6a52..5e99dc775c13 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -66,7 +66,7 @@ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(2) | \ P80211DID_MKITEM(1) | 0x) -#define DIDmsg_dot11req_mibset_resultcode \ +#define DIDMSG_DOT11REQ_MIBSET_RESULTCODE \ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(2) | \ P80211DID_MKITEM(2) | 0x) diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index 1062e07fe505..3c433a28bf8e 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c @@ -656,7 +656,7 @@ static int p80211knetdev_set_mac_address(struct net_device *dev, void *addr) memcpy(&macaddr->data.data, new_addr->sa_data, ETH_ALEN); /* Set up the resultcode argument */ - resultcode->did = DIDmsg_dot11req_mibset_resultcode; + resultcode->did = DIDMSG_DOT11REQ_MIBSET_RESULTCODE; resultcode->status = P80211ENUM_msgitem_status_no_value; resultcode->len = sizeof(resultcode->data); resultcode->data = 0; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 17/62] staging: wlan-ng: rename DIDmsg_p2req_readpda_pda in p80211metadef.h
Rename DIDmsg_p2req_readpda_pda in p80211metadef.h to DIDMSG_P2REQ_READPDA_PDA to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 16b4a57ffd40..72c49a655c2b 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -103,7 +103,7 @@ #define DIDMSG_P2REQ_READPDA \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(2)) -#define DIDmsg_p2req_readpda_pda \ +#define DIDMSG_P2REQ_READPDA_PDA \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(2) | \ P80211DID_MKITEM(1) | 0x) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index b33eac4dd57e..f85e2fea4544 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -790,7 +790,7 @@ static int read_cardpda(struct pda *pda, struct wlandevice *wlandev) msg->msgcode = DIDMSG_P2REQ_READPDA; msg->msglen = sizeof(msg); strcpy(msg->devname, wlandev->name); - msg->pda.did = DIDmsg_p2req_readpda_pda; + msg->pda.did = DIDMSG_P2REQ_READPDA_PDA; msg->pda.len = HFA384x_PDA_LEN_MAX; msg->pda.status = P80211ENUM_msgitem_status_no_value; msg->resultcode.did = DIDmsg_p2req_readpda_resultcode; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 22/62] staging: wlan-ng: rename DIDmsg_p2req_ramdl_state_exeaddr in p80211metadef.h
Rename DIDmsg_p2req_ramdl_state_exeaddr in p80211metadef.h to DIDMSG_P2REQ_RAMDL_STATE_EXEADDR to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index eba3da7f3b82..ddcb6326fe5a 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -118,7 +118,7 @@ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(11) | \ P80211DID_MKITEM(1) | 0x) -#define DIDmsg_p2req_ramdl_state_exeaddr \ +#define DIDMSG_P2REQ_RAMDL_STATE_EXEADDR \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(11) | \ P80211DID_MKITEM(2) | 0x) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index 5df3c954b4e1..eb3ca52e5da2 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -1024,7 +1024,7 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk, rstmsg->msgcode = DIDMSG_P2REQ_RAMDL_STATE; rstmsg->msglen = sizeof(*rstmsg); rstmsg->enable.did = DIDMSG_P2REQ_RAMDL_STATE_ENABLE; - rstmsg->exeaddr.did = DIDmsg_p2req_ramdl_state_exeaddr; + rstmsg->exeaddr.did = DIDMSG_P2REQ_RAMDL_STATE_EXEADDR; rstmsg->resultcode.did = DIDmsg_p2req_ramdl_state_resultcode; rstmsg->enable.status = P80211ENUM_msgitem_status_data_ok; rstmsg->exeaddr.status = P80211ENUM_msgitem_status_data_ok; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 18/62] staging: wlan-ng: rename DIDmsg_dot11ind_associate in p80211metadef.h
Rename DIDmsg_dot11ind_associate in p80211metadef.h to DIDMSG_DOT11IND_ASSOCIATE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 72c49a655c2b..18190e03015c 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -82,7 +82,7 @@ #define DIDMSG_DOT11IND_AUTHENTICATE \ (P80211DID_MKSECTION(2) | \ P80211DID_MKGROUP(1)) -#define DIDmsg_dot11ind_associate \ +#define DIDMSG_DOT11IND_ASSOCIATE \ (P80211DID_MKSECTION(2) | \ P80211DID_MKGROUP(3)) #define DIDMSG_LNXREQ_IFSTATE \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 34/62] staging: wlan-ng: rename DIDmib_dot11smt_dot11PrivacyTable in p80211metadef.h
Rename DIDmib_dot11smt_dot11PrivacyTable to DIDMIB_DOT11SMT_PRIVACYTABLE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Also shorten name by removing repeated use of "DOT11" to ease readability and reduce long lines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 2515c22b135e..b7fcdee2f954 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -159,7 +159,7 @@ #define didmib_dot11smt_wepdefaultkeystable_key(_i) \ (DIDMIB_DOT11SMT_WEPDEFAULTKEYSTABLE | \ P80211DID_MKITEM(_i) | 0x0c00) -#define DIDmib_dot11smt_dot11PrivacyTable \ +#define DIDMIB_DOT11SMT_PRIVACYTABLE \ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(6)) #define DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 23/62] staging: wlan-ng: rename DIDmsg_p2req_ramdl_state_resultcode in p80211metadef.h
Rename DIDmsg_p2req_ramdl_state_resultcode in p80211metadef.h to DIDMSG_P2REQ_RAMDL_STATE_RESULTCODE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index ddcb6326fe5a..98bf69d4c5d6 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -122,7 +122,7 @@ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(11) | \ P80211DID_MKITEM(2) | 0x) -#define DIDmsg_p2req_ramdl_state_resultcode \ +#define DIDMSG_P2REQ_RAMDL_STATE_RESULTCODE \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(11) | \ P80211DID_MKITEM(3) | 0x) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index eb3ca52e5da2..9c3eb90035e6 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -1025,7 +1025,7 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk, rstmsg->msglen = sizeof(*rstmsg); rstmsg->enable.did = DIDMSG_P2REQ_RAMDL_STATE_ENABLE; rstmsg->exeaddr.did = DIDMSG_P2REQ_RAMDL_STATE_EXEADDR; - rstmsg->resultcode.did = DIDmsg_p2req_ramdl_state_resultcode; + rstmsg->resultcode.did = DIDMSG_P2REQ_RAMDL_STATE_RESULTCODE; rstmsg->enable.status = P80211ENUM_msgitem_status_data_ok; rstmsg->exeaddr.status = P80211ENUM_msgitem_status_data_ok; rstmsg->resultcode.status = P80211ENUM_msgitem_status_no_value; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 21/62] staging: wlan-ng: rename DIDmsg_p2req_ramdl_state_enable in p80211metadef.h
Rename DIDmsg_p2req_ramdl_state_enable in p80211metadef.h to DIDMSG_P2REQ_RAMDL_STATE_ENABLE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 0ad3760bf779..eba3da7f3b82 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -114,7 +114,7 @@ #define DIDMSG_P2REQ_RAMDL_STATE \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(11)) -#define DIDmsg_p2req_ramdl_state_enable \ +#define DIDMSG_P2REQ_RAMDL_STATE_ENABLE \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(11) | \ P80211DID_MKITEM(1) | 0x) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index 37f63988d5c9..5df3c954b4e1 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -1023,7 +1023,7 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk, strcpy(rstmsg->devname, wlandev->name); rstmsg->msgcode = DIDMSG_P2REQ_RAMDL_STATE; rstmsg->msglen = sizeof(*rstmsg); - rstmsg->enable.did = DIDmsg_p2req_ramdl_state_enable; + rstmsg->enable.did = DIDMSG_P2REQ_RAMDL_STATE_ENABLE; rstmsg->exeaddr.did = DIDmsg_p2req_ramdl_state_exeaddr; rstmsg->resultcode.did = DIDmsg_p2req_ramdl_state_resultcode; rstmsg->enable.status = P80211ENUM_msgitem_status_data_ok; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 27/62] staging: wlan-ng: rename DIDmsg_p2req_ramdl_write_data in p80211metadef.h
Rename DIDmsg_p2req_ramdl_write_data in p80211metadef.h to DIDMSG_P2REQ_RAMDL_WRITE_DATA to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 325f7def940a..7e39ec91e70e 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -137,7 +137,7 @@ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(12) | \ P80211DID_MKITEM(2) | 0x) -#define DIDmsg_p2req_ramdl_write_data \ +#define DIDMSG_P2REQ_RAMDL_WRITE_DATA \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(12) | \ P80211DID_MKITEM(3) | 0x) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index ab7d45023263..76662f4e690d 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -1038,7 +1038,7 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk, rwrmsg->msglen = sizeof(*rwrmsg); rwrmsg->addr.did = DIDMSG_P2REQ_RAMDL_WRITE_ADDR; rwrmsg->len.did = DIDMSG_P2REQ_RAMDL_WRITE_LEN; - rwrmsg->data.did = DIDmsg_p2req_ramdl_write_data; + rwrmsg->data.did = DIDMSG_P2REQ_RAMDL_WRITE_DATA; rwrmsg->resultcode.did = DIDmsg_p2req_ramdl_write_resultcode; rwrmsg->addr.status = P80211ENUM_msgitem_status_data_ok; rwrmsg->len.status = P80211ENUM_msgitem_status_data_ok; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 28/62] staging: wlan-ng: rename DIDmsg_p2req_ramdl_write_resultcode in p80211metadef.h
Rename DIDmsg_p2req_ramdl_write_resultcode in p80211metadef.h to DIDMSG_P2REQ_RAMDL_WRITE_RESULTCODE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 7e39ec91e70e..d12a4b954f71 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -141,7 +141,7 @@ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(12) | \ P80211DID_MKITEM(3) | 0x) -#define DIDmsg_p2req_ramdl_write_resultcode \ +#define DIDMSG_P2REQ_RAMDL_WRITE_RESULTCODE \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(12) | \ P80211DID_MKITEM(4) | 0x) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index 76662f4e690d..d79d8623a1db 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -1039,7 +1039,7 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk, rwrmsg->addr.did = DIDMSG_P2REQ_RAMDL_WRITE_ADDR; rwrmsg->len.did = DIDMSG_P2REQ_RAMDL_WRITE_LEN; rwrmsg->data.did = DIDMSG_P2REQ_RAMDL_WRITE_DATA; - rwrmsg->resultcode.did = DIDmsg_p2req_ramdl_write_resultcode; + rwrmsg->resultcode.did = DIDMSG_P2REQ_RAMDL_WRITE_RESULTCODE; rwrmsg->addr.status = P80211ENUM_msgitem_status_data_ok; rwrmsg->len.status = P80211ENUM_msgitem_status_data_ok; rwrmsg->data.status = P80211ENUM_msgitem_status_data_ok; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 33/62] staging: wlan-ng: rename DIDmib_dot11smt_dot11WEPDefaultKeysTable_key in p80211metadef.h
Rename DIDmib_dot11smt_dot11WEPDefaultKeysTable_key in p80211metadef.h
to didmib_dot11smt_wepdefaultkeystable_key to fix "Avoid CamelCase"
message from checkpatch and conform to the coding style
guidelines. Also shorten name by removing repeated use of "DOT11" to
ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 6 +++---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/p80211req.c | 8
drivers/staging/wlan-ng/prism2mib.c | 8
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 8bc7a4c31d6c..6edc28c9c219 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -163,7 +163,7 @@ static int prism2_add_key(struct wiphy *wiphy, struct
net_device *dev,
return -EFAULT;
/* send key to driver */
- did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(key_index + 1);
+ did = didmib_dot11smt_wepdefaultkeystable_key(key_index + 1);
if (prism2_domibset_pstr32(wlandev, did, params->key_len, params->key))
return -EFAULT;
@@ -216,7 +216,7 @@ static int prism2_del_key(struct wiphy *wiphy, struct
net_device *dev,
return -EINVAL;
/* send key to driver */
- did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(key_index + 1);
+ did = didmib_dot11smt_wepdefaultkeystable_key(key_index + 1);
result = prism2_domibset_pstr32(wlandev, did, 13, "0");
if (result)
@@ -488,7 +488,7 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
goto exit;
/* send key to driver */
- did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(
+ did = didmib_dot11smt_wepdefaultkeystable_key(
sme->key_idx + 1);
result = prism2_domibset_pstr32(wlandev,
did, sme->key_len,
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index a74af59737ce..2515c22b135e 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -156,7 +156,7 @@
#define DIDMIB_DOT11SMT_WEPDEFAULTKEYSTABLE \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(4))
-#define DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(_i) \
+#define didmib_dot11smt_wepdefaultkeystable_key(_i) \
(DIDMIB_DOT11SMT_WEPDEFAULTKEYSTABLE | \
P80211DID_MKITEM(_i) | 0x0c00)
#define DIDmib_dot11smt_dot11PrivacyTable \
diff --git a/drivers/staging/wlan-ng/p80211req.c
b/drivers/staging/wlan-ng/p80211req.c
index cab577533767..7df34807ca84 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -205,10 +205,10 @@ static void p80211req_mibset_mibget(struct wlandevice
*wlandev,
u8 *key = mibitem->data + sizeof(struct p80211pstrd);
switch (mibitem->did) {
- case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(1):
- case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(2):
- case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(3):
- case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(4):
+ case didmib_dot11smt_wepdefaultkeystable_key(1):
+ case didmib_dot11smt_wepdefaultkeystable_key(2):
+ case didmib_dot11smt_wepdefaultkeystable_key(3):
+ case didmib_dot11smt_wepdefaultkeystable_key(4):
if (!isget)
wep_change_key(wlandev,
P80211DID_ITEM(mibitem->did) - 1,
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 8cf6ead518ea..ebd9921c3ed6 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -148,19 +148,19 @@ static int prism2mib_priv(struct mibrec *mib,
static struct mibrec mibtab[] = {
/* dot11smt MIB's */
- {DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(1),
+ {didmib_dot11smt_wepdefaultkeystable_key(1),
F_STA | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEY0, 0, 0,
prism2mib_wepdefaultkey},
- {DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(2),
+ {didmib_dot11smt_wepdefaultkeystable_key(2),
F_STA | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEY1, 0, 0,
prism2mib_wepdefaultkey},
- {DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(3),
+ {didmib_dot11smt_wepdefaultkeystable_key(3),
F_STA | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEY2, 0, 0,
prism2mib_wepdefaultkey},
- {DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(4),
+ {didmib_dot11
[PATCH v2 26/62] staging: wlan-ng: rename DIDmsg_p2req_ramdl_write_len in p80211metadef.h
Rename DIDmsg_p2req_ramdl_write_len to DIDMSG_P2REQ_RAMDL_WRITE_LEN to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index bdd2bc754659..325f7def940a 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -133,7 +133,7 @@ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(12) | \ P80211DID_MKITEM(1) | 0x) -#define DIDmsg_p2req_ramdl_write_len \ +#define DIDMSG_P2REQ_RAMDL_WRITE_LEN \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(12) | \ P80211DID_MKITEM(2) | 0x) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index 067bcf2af3fc..ab7d45023263 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -1037,7 +1037,7 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk, rwrmsg->msgcode = DIDMSG_P2REQ_RAMDL_WRITE; rwrmsg->msglen = sizeof(*rwrmsg); rwrmsg->addr.did = DIDMSG_P2REQ_RAMDL_WRITE_ADDR; - rwrmsg->len.did = DIDmsg_p2req_ramdl_write_len; + rwrmsg->len.did = DIDMSG_P2REQ_RAMDL_WRITE_LEN; rwrmsg->data.did = DIDmsg_p2req_ramdl_write_data; rwrmsg->resultcode.did = DIDmsg_p2req_ramdl_write_resultcode; rwrmsg->addr.status = P80211ENUM_msgitem_status_data_ok; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 32/62] staging: wlan-ng: rename DIDmib_dot11smt_dot11WEPDefaultKeysTable in p80211metadef.h
Rename DIDmib_dot11smt_dot11WEPDefaultKeysTable in p80211metadef.h to DIDMIB_DOT11SMT_WEPDEFAULTKEYSTABLE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Also shorten name by removing repeated use of "DOT11" to ease readability and reduce long lines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index bcc44621664a..a74af59737ce 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -153,11 +153,11 @@ P80211DID_MKGROUP(14)) #define DIDMIB_CAT_DOT11SMT \ P80211DID_MKSECTION(1) -#define DIDmib_dot11smt_dot11WEPDefaultKeysTable \ +#define DIDMIB_DOT11SMT_WEPDEFAULTKEYSTABLE \ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(4)) #define DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(_i) \ - (DIDmib_dot11smt_dot11WEPDefaultKeysTable | \ + (DIDMIB_DOT11SMT_WEPDEFAULTKEYSTABLE | \ P80211DID_MKITEM(_i) | 0x0c00) #define DIDmib_dot11smt_dot11PrivacyTable \ (P80211DID_MKSECTION(1) | \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 35/62] staging: wlan-ng: rename DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked in p80211metadef.h
Rename DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked to
DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED to fix "Avoid CamelCase"
message from checkpatch and conform to the coding style
guidelines. Also shorten name by removing repeated use of "DOT11" to
ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 4 ++--
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/p80211req.c | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 6edc28c9c219..e27daf2b700d 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -502,7 +502,7 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
* seems reasonable anyways
*/
result = prism2_domibset_uint32(wlandev,
-
DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,
+
DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED,
P80211ENUM_truth_true);
if (result)
goto exit;
@@ -518,7 +518,7 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
* and exclude unencrypted
*/
result = prism2_domibset_uint32(wlandev,
-
DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,
+
DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED,
P80211ENUM_truth_false);
if (result)
goto exit;
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index b7fcdee2f954..3dfa1da983e8 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -162,7 +162,7 @@
#define DIDMIB_DOT11SMT_PRIVACYTABLE \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(6))
-#define DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked \
+#define DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(1) | 0x1800)
diff --git a/drivers/staging/wlan-ng/p80211req.c
b/drivers/staging/wlan-ng/p80211req.c
index 7df34807ca84..7fcee85c2881 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -226,7 +226,7 @@ static void p80211req_mibset_mibget(struct wlandevice
*wlandev,
}
break;
}
- case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked:{
+ case DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED:{
u32 *data = (u32 *)mibitem->data;
p80211req_handle_action(wlandev, data, isget,
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index ebd9921c3ed6..831f315084bc 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -164,7 +164,7 @@ static struct mibrec mibtab[] = {
F_STA | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEY3, 0, 0,
prism2mib_wepdefaultkey},
- {DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked,
+ {DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_PRIVINVOKED, 0,
prism2mib_privacyinvoked},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 29/62] staging: wlan-ng: rename DIDmsg_p2req_flashdl_state in p80211metadef.h
Rename DIDmsg_p2req_flashdl_state in p80211metadef.h to
DIDMSG_P2REQ_FLASHDL_STATE to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index d12a4b954f71..91b611b942c3 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -145,7 +145,7 @@
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(12) | \
P80211DID_MKITEM(4) | 0x)
-#define DIDmsg_p2req_flashdl_state \
+#define DIDMSG_P2REQ_FLASHDL_STATE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(13))
#define DIDmsg_p2req_flashdl_write \
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index 2aae19ebe3cc..ee49a8f3693e 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -323,7 +323,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received mlme ramdl_write request\n");
result = prism2mgmt_ramdl_write(wlandev, msg);
break;
- case DIDmsg_p2req_flashdl_state:
+ case DIDMSG_P2REQ_FLASHDL_STATE:
pr_debug("Received mlme flashdl_state request\n");
result = prism2mgmt_flashdl_state(wlandev, msg);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 47/62] staging: wlan-ng: rename DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel in p80211metadef.h
Rename DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel
in p80211metadef.h to DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL
to fix "Avoid CamelCase" message from checkpatch and conform to the
coding style guidelines. Also shorten name by removing repeated use of
"DOT11" and "DOT11PHY" to ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 4 ++--
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 9133d5174425..9af2aaf01e14 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -595,7 +595,7 @@ static int prism2_set_tx_power(struct wiphy *wiphy, struct
wireless_dev *wdev,
data = MBM_TO_DBM(mbm);
result = prism2_domibset_uint32(wlandev,
- DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel,
+ DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL,
data);
if (result) {
@@ -620,7 +620,7 @@ static int prism2_get_tx_power(struct wiphy *wiphy, struct
wireless_dev *wdev,
mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data;
msg.msgcode = DIDMSG_DOT11REQ_MIBGET;
mibitem->did =
- DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
+ DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL;
result = p80211req_dorequest(wlandev, (u8 *)&msg);
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 53f380f2f66f..5d06b342b980 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -206,7 +206,7 @@
#define DIDMIB_DOT11PHY_OPERATIONTABLE \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(1))
-#define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel \
+#define DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(10) | 0x1800)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index dbe49bda8043..1e0d061b 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -210,7 +210,7 @@ static struct mibrec mibtab[] = {
F_STA | F_READ,
HFA384x_RID_CURRENTCHANNEL, 0, 0,
prism2mib_uint32},
- {DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel,
+ {DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL,
F_STA | F_READ | F_WRITE,
HFA384x_RID_TXPOWERMAX, 0, 0,
prism2mib_uint32},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 44/62] staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime in p80211metadef.h
Rename
DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime in
p80211metadef.h to
DIDMIB_DOT11MAC_OPERATIONTABLE_MAXTRANSMITMSDULIFETIME to fix "Avoid
CamelCase" message from checkpatch and conform to the coding style
guidelines. Also shorten name by removing repeated use of "DOT11" to
ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 08655902a82e..db6b15c688ba 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -197,7 +197,7 @@
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(5) | 0x1800)
-#define DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_MAXTRANSMITMSDULIFETIME \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(6) | 0x1000)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 645211898bce..dbe49bda8043 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -199,7 +199,7 @@ static struct mibrec mibtab[] = {
F_STA | F_READ | F_WRITE,
HFA384x_RID_FRAGTHRESH, 0, 0,
prism2mib_fragmentationthreshold},
- {DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime,
+ {DIDMIB_DOT11MAC_OPERATIONTABLE_MAXTRANSMITMSDULIFETIME,
F_STA | F_READ,
HFA384x_RID_MAXTXLIFETIME, 0, 0,
prism2mib_uint32},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 31/62] staging: wlan-ng: rename DIDmib_cat_dot11smt in p80211metadef.h
Rename DIDmib_cat_dot11smt in p80211metadef.h to DIDMIB_CAT_DOT11SMT to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index a0ccd267ee31..bcc44621664a 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -151,7 +151,7 @@ #define DIDMSG_P2REQ_FLASHDL_WRITE \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(14)) -#define DIDmib_cat_dot11smt \ +#define DIDMIB_CAT_DOT11SMT \ P80211DID_MKSECTION(1) #define DIDmib_dot11smt_dot11WEPDefaultKeysTable \ (P80211DID_MKSECTION(1) | \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 38/62] staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable in p80211metadef.h
Rename DIDmib_dot11mac_dot11OperationTable in p80211metadef.h to DIDMIB_DOT11MAC_OPERATIONTABLE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Also shorten name by removing repeated use of "DOT11" to ease readability and reduce long lines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index a386b6cb15bc..79f6813cd9d6 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -174,7 +174,7 @@ (P80211DID_MKSECTION(1) | \ P80211DID_MKGROUP(6) | \ P80211DID_MKITEM(4) | 0x1800) -#define DIDmib_dot11mac_dot11OperationTable \ +#define DIDMIB_DOT11MAC_OPERATIONTABLE \ (P80211DID_MKSECTION(2) | \ P80211DID_MKGROUP(1)) #define DIDmib_dot11mac_dot11OperationTable_dot11MACAddress \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 56/62] staging: wlan-ng: rename DIDmib_p2_p2NIC_p2PRISupRange in p80211metadef.h
Rename DIDmib_p2_p2NIC_p2PRISupRange in p80211metadef.h to DIDMIB_P2_NIC_PRISUPRANGE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Also shorten name by removing repeated use of "P2" to ease readability and reduce long lines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- drivers/staging/wlan-ng/prism2fw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 4939cdf7606c..b2ff1db8ca65 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -235,7 +235,7 @@ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(2) | \ P80211DID_MKITEM(1) | 0x1800) -#define DIDmib_p2_p2NIC_p2PRISupRange \ +#define DIDMIB_P2_NIC_PRISUPRANGE \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(5) | \ P80211DID_MKITEM(6) | 0x1000) diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index d79d8623a1db..f99626ca6bdc 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -304,7 +304,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr, getmsg.resultcode.status = P80211ENUM_msgitem_status_no_value; item = (struct p80211itemd *)getmsg.mibattribute.data; - item->did = DIDmib_p2_p2NIC_p2PRISupRange; + item->did = DIDMIB_P2_NIC_PRISUPRANGE; item->status = P80211ENUM_msgitem_status_no_value; data = (u32 *)item->data; -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 52/62] staging: wlan-ng: rename DIDmib_lnx_lnxConfigTable_lnxRSNAIE in p80211metadef.h
Rename DIDmib_lnx_lnxConfigTable_lnxRSNAIE in p80211metadef.h to
DIDMIB_LNX_CONFIGTABLE_RSNAIE to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines. Also shorten
name by removing repeated use of "LNX" to ease readability and reduce
long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index d04e78148314..7fbf9614edbe 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -222,7 +222,7 @@
#define DIDMIB_LNX_CONFIGTABLE \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1))
-#define DIDmib_lnx_lnxConfigTable_lnxRSNAIE \
+#define DIDMIB_LNX_CONFIGTABLE_RSNAIE \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(1) | 0x1800)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index a8da03ced62e..ea918df825d2 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -230,7 +230,7 @@ static struct mibrec mibtab[] = {
prism2mib_uint32},
/* And finally, lnx mibs */
- {DIDmib_lnx_lnxConfigTable_lnxRSNAIE,
+ {DIDMIB_LNX_CONFIGTABLE_RSNAIE,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWPADATA, 0, 0,
prism2mib_priv},
@@ -707,7 +707,7 @@ static int prism2mib_priv(struct mibrec *mib,
struct p80211pstrd *pstr = data;
switch (mib->did) {
- case DIDmib_lnx_lnxConfigTable_lnxRSNAIE:{
+ case DIDMIB_LNX_CONFIGTABLE_RSNAIE:{
struct hfa384x_wpa_data wpa;
if (isget) {
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 50/62] staging: wlan-ng: rename DIDmib_cat_lnx in p80211metadef.h
Rename DIDmib_cat_lnx in p80211metadef.h to DIDMIB_CAT_LNX to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index d8dcc94d6f2c..e332c98ae2a5 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -217,7 +217,7 @@ (P80211DID_MKSECTION(3) | \ P80211DID_MKGROUP(5) | \ P80211DID_MKITEM(1) | 0x1000) -#define DIDmib_cat_lnx \ +#define DIDMIB_CAT_LNX \ P80211DID_MKSECTION(4) #define DIDmib_lnx_lnxConfigTable \ (P80211DID_MKSECTION(4) | \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 30/62] staging: wlan-ng: rename DIDmsg_p2req_flashdl_write in p80211metadef.h
Rename DIDmsg_p2req_flashdl_write in p80211metadef.h to
DIDMSG_P2REQ_FLASHDL_WRITE to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 91b611b942c3..a0ccd267ee31 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -148,7 +148,7 @@
#define DIDMSG_P2REQ_FLASHDL_STATE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(13))
-#define DIDmsg_p2req_flashdl_write \
+#define DIDMSG_P2REQ_FLASHDL_WRITE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(14))
#define DIDmib_cat_dot11smt \
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index ee49a8f3693e..99266581511f 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -327,7 +327,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received mlme flashdl_state request\n");
result = prism2mgmt_flashdl_state(wlandev, msg);
break;
- case DIDmsg_p2req_flashdl_write:
+ case DIDMSG_P2REQ_FLASHDL_WRITE:
pr_debug("Received mlme flashdl_write request\n");
result = prism2mgmt_flashdl_write(wlandev, msg);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 45/62] staging: wlan-ng: rename DIDmib_cat_dot11phy in p80211metadef.h
Rename DIDmib_cat_dot11phy in p80211metadef.h to DIDMIB_CAT_DOT11PHY to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index db6b15c688ba..9e865f82cf98 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -201,7 +201,7 @@ (P80211DID_MKSECTION(2) | \ P80211DID_MKGROUP(1) | \ P80211DID_MKITEM(6) | 0x1000) -#define DIDmib_cat_dot11phy \ +#define DIDMIB_CAT_DOT11PHY \ P80211DID_MKSECTION(3) #define DIDmib_dot11phy_dot11PhyOperationTable \ (P80211DID_MKSECTION(3) | \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 58/62] staging: wlan-ng: rename DIDmib_p2_p2MAC_p2CurrentTxRate in p80211metadef.h
Rename DIDmib_p2_p2MAC_p2CurrentTxRate in p80211metadef.h to
DIDMIB_P2_MAC_CURRENTTXRATE to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines. Also shorten
name by removing repeated use of "P2" to ease readability and reduce
long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
drivers/staging/wlan-ng/prism2sta.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index d42b91dce4b0..95e79a32abfb 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -242,7 +242,7 @@
#define DIDMIB_P2_MAC \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(6))
-#define DIDmib_p2_p2MAC_p2CurrentTxRate \
+#define DIDMIB_P2_MAC_CURRENTTXRATE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(12) | 0x1000)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 32d1515904d4..32a634478cc1 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -224,7 +224,7 @@ static struct mibrec mibtab[] = {
/* p2MAC MIB's */
- {DIDmib_p2_p2MAC_p2CurrentTxRate,
+ {DIDMIB_P2_MAC_CURRENTTXRATE,
F_STA | F_READ,
HFA384x_RID_CURRENTTXRATE, 0, 0,
prism2mib_uint32},
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index 99266581511f..83e80fbf9c6a 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -1950,7 +1950,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
/* Get the signal rate */
msg.msgcode = DIDMSG_DOT11REQ_MIBGET;
- mibitem->did = DIDmib_p2_p2MAC_p2CurrentTxRate;
+ mibitem->did = DIDMIB_P2_MAC_CURRENTTXRATE;
result = p80211req_dorequest(wlandev, (u8 *)&msg);
if (result) {
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 42/62] staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit in p80211metadef.h
Rename DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimitin
p80211metadef.h to DIDMIB_DOT11MAC_OPERATIONTABLE_LONGRETRYLIMIT to
fix "Avoid CamelCase" message from checkpatch and conform to the
coding style guidelines. Also shorten name by removing repeated use of
"DOT11" to ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index f195189ff7fb..607db912c8d4 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -189,7 +189,7 @@
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(3) | 0x1000)
-#define DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_LONGRETRYLIMIT \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(4) | 0x1000)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index bf2df34e1d1b..9365c6b6086b 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -191,7 +191,7 @@ static struct mibrec mibtab[] = {
F_STA | F_READ,
HFA384x_RID_SHORTRETRYLIMIT, 0, 0,
prism2mib_uint32},
- {DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit,
+ {DIDMIB_DOT11MAC_OPERATIONTABLE_LONGRETRYLIMIT,
F_STA | F_READ,
HFA384x_RID_LONGRETRYLIMIT, 0, 0,
prism2mib_uint32},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 41/62] staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit in p80211metadef.h
Rename DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit in
p80211metadef.h to DIDMIB_DOT11MAC_OPERATIONTABLE_SHORTRETRYLIMIT to
fix "Avoid CamelCase" message from checkpatch and conform to the
coding style guidelines. Also shorten name by removing repeated use of
"DOT11" to ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 9cfbc6177380..f195189ff7fb 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -185,7 +185,7 @@
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(2) | 0x1800)
-#define DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_SHORTRETRYLIMIT \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(3) | 0x1000)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 7b036674e2ea..bf2df34e1d1b 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -187,7 +187,7 @@ static struct mibrec mibtab[] = {
F_STA | F_READ | F_WRITE,
HFA384x_RID_RTSTHRESH, 0, 0,
prism2mib_uint32},
- {DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit,
+ {DIDMIB_DOT11MAC_OPERATIONTABLE_SHORTRETRYLIMIT,
F_STA | F_READ,
HFA384x_RID_SHORTRETRYLIMIT, 0, 0,
prism2mib_uint32},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 55/62] staging: wlan-ng: rename DIDmib_p2_p2Static_p2CnfPortType in p80211metadef.h
Rename DIDmib_p2_p2Static_p2CnfPortType in p80211metadef.h to
DIDMIB_P2_STATIC_CNFPORTTYPE to fix "Avoid CamelCase" message from
checkpatch and conform to the coding style guidelines. Also shorten
name by removing repeated use of "P2" to ease readability and reduce
long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 2 +-
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 9602ef0b5ae1..a2f1136b97fa 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -129,7 +129,7 @@ static int prism2_change_virtual_intf(struct wiphy *wiphy,
/* Set Operation mode to the PORT TYPE RID */
result = prism2_domibset_uint32(wlandev,
- DIDmib_p2_p2Static_p2CnfPortType,
+ DIDMIB_P2_STATIC_CNFPORTTYPE,
data);
if (result)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 44618d9ddeea..4939cdf7606c 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -231,7 +231,7 @@
#define DIDMIB_P2_STATIC \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(2))
-#define DIDmib_p2_p2Static_p2CnfPortType \
+#define DIDMIB_P2_STATIC_CNFPORTTYPE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(2) | \
P80211DID_MKITEM(1) | 0x1800)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index ea918df825d2..32d1515904d4 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -217,7 +217,7 @@ static struct mibrec mibtab[] = {
/* p2Static MIB's */
- {DIDmib_p2_p2Static_p2CnfPortType,
+ {DIDMIB_P2_STATIC_CNFPORTTYPE,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFPORTTYPE, 0, 0,
prism2mib_uint32},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 46/62] staging: wlan-ng: rename DIDmib_dot11phy_dot11PhyOperationTable in p80211metadef.h
Rename DIDmib_dot11phy_dot11PhyOperationTable in p80211metadef.h to DIDMIB_DOT11PHY_OPERATIONTABLE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Also shorten name by removing repeated use of "DOT11PHY" to ease readability and reduce long lines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 9e865f82cf98..53f380f2f66f 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -203,7 +203,7 @@ P80211DID_MKITEM(6) | 0x1000) #define DIDMIB_CAT_DOT11PHY \ P80211DID_MKSECTION(3) -#define DIDmib_dot11phy_dot11PhyOperationTable \ +#define DIDMIB_DOT11PHY_OPERATIONTABLE \ (P80211DID_MKSECTION(3) | \ P80211DID_MKGROUP(1)) #define DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 62/62] staging: wlan-ng: remove "autogenerated code" comments
p80211metadef.h and p80211metastruct.h both have comments stating they are autogenerated and should not be edited. However, neither is generated during build and both have had numerous manual edits since the driver has been in staging. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h| 3 +-- drivers/staging/wlan-ng/p80211metastruct.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 95e79a32abfb..1b91b64c12ed 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ -/* This file is GENERATED AUTOMATICALLY. DO NOT EDIT OR MODIFY. - * +/* * * Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. * diff --git a/drivers/staging/wlan-ng/p80211metastruct.h b/drivers/staging/wlan-ng/p80211metastruct.h index 5602ec606074..4adc64580185 100644 --- a/drivers/staging/wlan-ng/p80211metastruct.h +++ b/drivers/staging/wlan-ng/p80211metastruct.h @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ -/* This file is GENERATED AUTOMATICALLY. DO NOT EDIT OR MODIFY. - * +/* * * Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. * -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 48/62] staging: wlan-ng: rename DIDmib_dot11phy_dot11PhyDSSSTable in p80211metadef.h
Rename DIDmib_dot11phy_dot11PhyDSSSTable in p80211metadef.h to DIDMIB_DOT11PHY_DSSSTABLE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Also shorten name by removing repeated use of "DOT11PHY" to ease readability and reduce long lines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 5d06b342b980..dae733524342 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -210,7 +210,7 @@ (P80211DID_MKSECTION(3) | \ P80211DID_MKGROUP(3) | \ P80211DID_MKITEM(10) | 0x1800) -#define DIDmib_dot11phy_dot11PhyDSSSTable \ +#define DIDMIB_DOT11PHY_DSSSTABLE \ (P80211DID_MKSECTION(3) | \ P80211DID_MKGROUP(5)) #define DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 40/62] staging: wlan-ng: DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold in p80211metadef.h
Rename DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold in
p80211metadef.h to DIDMIB_DOT11MAC_OPERATIONTABLE_RTSTHRESHOLD to fix
"Avoid CamelCase" message from checkpatch and conform to the coding
style guidelines. Also shorten name by removing repeated use of
"DOT11" to ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 2 +-
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 943cda8a2fab..5b9a2f01a08d 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -410,7 +410,7 @@ static int prism2_set_wiphy_params(struct wiphy *wiphy, u32
changed)
data = wiphy->rts_threshold;
result = prism2_domibset_uint32(wlandev,
-
DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold,
+
DIDMIB_DOT11MAC_OPERATIONTABLE_RTSTHRESHOLD,
data);
if (result) {
err = -EFAULT;
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index d0597644c0ae..9cfbc6177380 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -181,7 +181,7 @@
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(1) | 0x1800)
-#define DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_RTSTHRESHOLD \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(2) | 0x1800)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 0f2d7834b11b..7b036674e2ea 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -183,7 +183,7 @@ static struct mibrec mibtab[] = {
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFOWNMACADDR, HFA384x_RID_CNFOWNMACADDR_LEN, 0,
prism2mib_bytearea2pstr},
- {DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold,
+ {DIDMIB_DOT11MAC_OPERATIONTABLE_RTSTHRESHOLD,
F_STA | F_READ | F_WRITE,
HFA384x_RID_RTSTHRESH, 0, 0,
prism2mib_uint32},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 53/62] staging: wlan-ng: rename DIDmib_cat_p2 in p80211metadef.h
Rename DIDmib_cat_p2 in p80211metadef.h to DIDMIB_CAT_P2 to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 7fbf9614edbe..5ac049f403f4 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -226,7 +226,7 @@ (P80211DID_MKSECTION(4) | \ P80211DID_MKGROUP(1) | \ P80211DID_MKITEM(1) | 0x1800) -#define DIDmib_cat_p2 \ +#define DIDMIB_CAT_P2 \ P80211DID_MKSECTION(5) #define DIDmib_p2_p2Static \ (P80211DID_MKSECTION(5) | \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 51/62] staging: wlan-ng: rename DIDmib_lnx_lnxConfigTable in p80211metadef.h
Rename DIDmib_lnx_lnxConfigTable in p80211metadef.h to DIDMIB_LNX_CONFIGTABLE to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Also shorten name by removing repeated use of "LNX" to ease readability and reduce long lines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index e332c98ae2a5..d04e78148314 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -219,7 +219,7 @@ P80211DID_MKITEM(1) | 0x1000) #define DIDMIB_CAT_LNX \ P80211DID_MKSECTION(4) -#define DIDmib_lnx_lnxConfigTable \ +#define DIDMIB_LNX_CONFIGTABLE \ (P80211DID_MKSECTION(4) | \ P80211DID_MKGROUP(1)) #define DIDmib_lnx_lnxConfigTable_lnxRSNAIE \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 37/62] staging: wlan-ng: rename DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted in p80211metadef.h
Rename DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted in
p80211metadef.h to DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED to
fix "Avoid CamelCase" message from checkpatch and conform to the
coding style guidelines. Also shorten name by removing repeated use of
"DOT11" to ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 4 ++--
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/p80211req.c | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 11f59a70f4a0..943cda8a2fab 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -508,7 +508,7 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
goto exit;
result = prism2_domibset_uint32(wlandev,
-
DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
+
DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED,
P80211ENUM_truth_true);
if (result)
goto exit;
@@ -524,7 +524,7 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
goto exit;
result = prism2_domibset_uint32(wlandev,
-
DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
+
DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED,
P80211ENUM_truth_false);
if (result)
goto exit;
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index c21c0cc9c993..a386b6cb15bc 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -170,7 +170,7 @@
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(2) | 0x1800)
-#define DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted \
+#define DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(4) | 0x1800)
diff --git a/drivers/staging/wlan-ng/p80211req.c
b/drivers/staging/wlan-ng/p80211req.c
index eb14b56791f2..ab920d6a112b 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -233,7 +233,7 @@ static void p80211req_mibset_mibget(struct wlandevice
*wlandev,
HOSTWEP_PRIVACYINVOKED);
break;
}
- case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted:{
+ case DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED:{
u32 *data = (u32 *)mibitem->data;
p80211req_handle_action(wlandev, data, isget,
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 3d22fe723887..b7c82bc61536 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -172,7 +172,7 @@ static struct mibrec mibtab[] = {
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEYID, 0, 0,
prism2mib_uint32},
- {DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted,
+ {DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_EXCLUDE, 0,
prism2mib_excludeunencrypted},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 43/62] staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold in p80211metadef.h
Rename DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold
in p80211metadef.h to
DIDMIB_DOT11MAC_OPERATIONTABLE_FRAGMENTATIONTHRESHOLD to fix "Avoid
CamelCase" message from checkpatch and conform to the coding style
guidelines. Also shorten name by removing repeated use of "DOT11" to
ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 2 +-
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 5b9a2f01a08d..9133d5174425 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -425,7 +425,7 @@ static int prism2_set_wiphy_params(struct wiphy *wiphy, u32
changed)
data = wiphy->frag_threshold;
result = prism2_domibset_uint32(wlandev,
-
DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold,
+
DIDMIB_DOT11MAC_OPERATIONTABLE_FRAGMENTATIONTHRESHOLD,
data);
if (result) {
err = -EFAULT;
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 607db912c8d4..08655902a82e 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -193,7 +193,7 @@
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(4) | 0x1000)
-#define DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_FRAGMENTATIONTHRESHOLD \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(5) | 0x1800)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 9365c6b6086b..645211898bce 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -195,7 +195,7 @@ static struct mibrec mibtab[] = {
F_STA | F_READ,
HFA384x_RID_LONGRETRYLIMIT, 0, 0,
prism2mib_uint32},
- {DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold,
+ {DIDMIB_DOT11MAC_OPERATIONTABLE_FRAGMENTATIONTHRESHOLD,
F_STA | F_READ | F_WRITE,
HFA384x_RID_FRAGTHRESH, 0, 0,
prism2mib_fragmentationthreshold},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 49/62] staging: wlan-ng: rename DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel in p80211metadef.h
Rename DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel in
p80211metadef.h to DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL to fix
"Avoid CamelCase" message from checkpatch and conform to the coding
style guidelines. Also shorten name by removing repeated use of
"DOT11" and "DOT11PHY" to ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 2 +-
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 9af2aaf01e14..9602ef0b5ae1 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -455,7 +455,7 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
if (channel) {
chan = ieee80211_frequency_to_channel(channel->center_freq);
result = prism2_domibset_uint32(wlandev,
-
DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel,
+
DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL,
chan);
if (result)
goto exit;
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index dae733524342..d8dcc94d6f2c 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -213,7 +213,7 @@
#define DIDMIB_DOT11PHY_DSSSTABLE \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(5))
-#define DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel \
+#define DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(5) | \
P80211DID_MKITEM(1) | 0x1000)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 1e0d061b..a8da03ced62e 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -206,7 +206,7 @@ static struct mibrec mibtab[] = {
/* dot11phy MIB's */
- {DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel,
+ {DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL,
F_STA | F_READ,
HFA384x_RID_CURRENTCHANNEL, 0, 0,
prism2mib_uint32},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 39/62] staging: wlan-ng: rename DIDmib_dot11mac_dot11OperationTable_dot11MACAddress in p80211metadef.h
Rename DIDmib_dot11mac_dot11OperationTable_dot11MACAddress in
p80211metadef.h to DIDMIB_DOT11MAC_OPERATIONTABLE_MACADDRESS to fix
"Avoid CamelCase" message from checkpatch and conform to the coding
style guidelines. Also shorten name by removing repeated use of
"DOT11" to ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/p80211netdev.c | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 79f6813cd9d6..d0597644c0ae 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -177,7 +177,7 @@
#define DIDMIB_DOT11MAC_OPERATIONTABLE \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1))
-#define DIDmib_dot11mac_dot11OperationTable_dot11MACAddress \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_MACADDRESS \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(1) | 0x1800)
diff --git a/drivers/staging/wlan-ng/p80211netdev.c
b/drivers/staging/wlan-ng/p80211netdev.c
index 3c433a28bf8e..a70fb84f38f1 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -649,7 +649,7 @@ static int p80211knetdev_set_mac_address(struct net_device
*dev, void *addr)
mibattr->status = P80211ENUM_msgitem_status_data_ok;
mibattr->len = sizeof(mibattr->data);
- macaddr->did = DIDmib_dot11mac_dot11OperationTable_dot11MACAddress;
+ macaddr->did = DIDMIB_DOT11MAC_OPERATIONTABLE_MACADDRESS;
macaddr->status = P80211ENUM_msgitem_status_data_ok;
macaddr->len = sizeof(macaddr->data);
macaddr->data.len = ETH_ALEN;
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index b7c82bc61536..0f2d7834b11b 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -179,7 +179,7 @@ static struct mibrec mibtab[] = {
/* dot11mac MIB's */
- {DIDmib_dot11mac_dot11OperationTable_dot11MACAddress,
+ {DIDMIB_DOT11MAC_OPERATIONTABLE_MACADDRESS,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFOWNMACADDR, HFA384x_RID_CNFOWNMACADDR_LEN, 0,
prism2mib_bytearea2pstr},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 59/62] staging: wlan-ng: formatting cleanup in cfg80211.c
Combine previously split lines for an assignment; now fits in 80 characters as the name of the macro being assigned was shortened. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/cfg80211.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c index a2f1136b97fa..47f2ee926a77 100644 --- a/drivers/staging/wlan-ng/cfg80211.c +++ b/drivers/staging/wlan-ng/cfg80211.c @@ -619,8 +619,7 @@ static int prism2_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data; msg.msgcode = DIDMSG_DOT11REQ_MIBGET; - mibitem->did = - DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL; + mibitem->did = DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL; result = p80211req_dorequest(wlandev, (u8 *)&msg); -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 36/62] staging: wlan-ng: rename DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID in p80211metadef.h
Rename DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID in
p80211metadef.h to DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID to fix
"Avoid CamelCase" message from checkpatch and conform to the coding
style guidelines. Also shorten name by removing repeated use of
"DOT11" to ease readability and reduce long lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 6 +++---
drivers/staging/wlan-ng/p80211metadef.h | 2 +-
drivers/staging/wlan-ng/p80211req.c | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index e27daf2b700d..11f59a70f4a0 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -158,7 +158,7 @@ static int prism2_add_key(struct wiphy *wiphy, struct
net_device *dev,
}
if (prism2_domibset_uint32(wlandev,
-
DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
+ DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
key_index))
return -EFAULT;
@@ -234,7 +234,7 @@ static int prism2_set_default_key(struct wiphy *wiphy,
struct net_device *dev,
int result = 0;
result = prism2_domibset_uint32(wlandev,
- DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
+ DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
key_index);
if (result)
@@ -482,7 +482,7 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
}
result = prism2_domibset_uint32(wlandev,
-
DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
+ DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
sme->key_idx);
if (result)
goto exit;
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 3dfa1da983e8..c21c0cc9c993 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -166,7 +166,7 @@
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(1) | 0x1800)
-#define DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID \
+#define DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(2) | 0x1800)
diff --git a/drivers/staging/wlan-ng/p80211req.c
b/drivers/staging/wlan-ng/p80211req.c
index 7fcee85c2881..eb14b56791f2 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -215,7 +215,7 @@ static void p80211req_mibset_mibget(struct wlandevice
*wlandev,
key, pstr->len);
break;
- case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID:{
+ case DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID:{
u32 *data = (u32 *)mibitem->data;
if (isget) {
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 831f315084bc..3d22fe723887 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -168,7 +168,7 @@ static struct mibrec mibtab[] = {
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWEPFLAGS, HFA384x_WEPFLAGS_PRIVINVOKED, 0,
prism2mib_privacyinvoked},
- {DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID,
+ {DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWEPDEFAULTKEYID, 0, 0,
prism2mib_uint32},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 54/62] staging: wlan-ng: rename DIDmib_p2_p2Static in p80211metadef.h
Rename DIDmib_p2_p2Static in p80211metadef.h to DIDMIB_P2_STATIC to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Also shorten name by removing repeated use of "P2" to ease readability and reduce long lines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 5ac049f403f4..44618d9ddeea 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -228,7 +228,7 @@ P80211DID_MKITEM(1) | 0x1800) #define DIDMIB_CAT_P2 \ P80211DID_MKSECTION(5) -#define DIDmib_p2_p2Static \ +#define DIDMIB_P2_STATIC \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(2)) #define DIDmib_p2_p2Static_p2CnfPortType \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 57/62] staging: wlan-ng: rename DIDmib_p2_p2MAC in p80211metadef.h
Rename DIDmib_p2_p2MAC in p80211metadef.h to DIDMIB_P2_MAC to fix "Avoid CamelCase" message from checkpatch and conform to the coding style guidelines. Also shorten name by removing repeated use of "P2" to ease readability and reduce long lines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index b2ff1db8ca65..d42b91dce4b0 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -239,7 +239,7 @@ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(5) | \ P80211DID_MKITEM(6) | 0x1000) -#define DIDmib_p2_p2MAC \ +#define DIDMIB_P2_MAC \ (P80211DID_MKSECTION(5) | \ P80211DID_MKGROUP(6)) #define DIDmib_p2_p2MAC_p2CurrentTxRate \ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 60/62] staging: wlan-ng: make switch case block format consistent
For switch statements with case blocks make the format consistent by
applying K&R formatting, a space before the opening brace, single
indentation of contained code, break inside the block and closing
brace aligned with case.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x_usb.c | 48 +--
drivers/staging/wlan-ng/p80211req.c | 20 ++--
drivers/staging/wlan-ng/prism2mib.c | 38 +++---
drivers/staging/wlan-ng/prism2sta.c | 61 +--
4 files changed, 82 insertions(+), 85 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c
b/drivers/staging/wlan-ng/hfa384x_usb.c
index 16f7dd266e3b..fb32aaf13628 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3605,36 +3605,34 @@ static void hfa384x_usbout_callback(struct urb *urb)
prism2sta_ev_alloc(wlandev);
break;
- case -EPIPE:
- {
- struct hfa384x *hw = wlandev->priv;
+ case -EPIPE: {
+ struct hfa384x *hw = wlandev->priv;
- netdev_warn(hw->wlandev->netdev,
- "%s tx pipe stalled: requesting
reset\n",
- wlandev->netdev->name);
- if (!test_and_set_bit
- (WORK_TX_HALT, &hw->usb_flags))
- schedule_work(&hw->usb_work);
- wlandev->netdev->stats.tx_errors++;
- break;
- }
+ netdev_warn(hw->wlandev->netdev,
+ "%s tx pipe stalled: requesting reset\n",
+ wlandev->netdev->name);
+ if (!test_and_set_bit
+ (WORK_TX_HALT, &hw->usb_flags))
+ schedule_work(&hw->usb_work);
+ wlandev->netdev->stats.tx_errors++;
+ break;
+ }
case -EPROTO:
case -ETIMEDOUT:
- case -EILSEQ:
- {
- struct hfa384x *hw = wlandev->priv;
-
- if (!test_and_set_bit
- (THROTTLE_TX, &hw->usb_flags) &&
- !timer_pending(&hw->throttle)) {
- mod_timer(&hw->throttle,
- jiffies + THROTTLE_JIFFIES);
- }
- wlandev->netdev->stats.tx_errors++;
- netif_stop_queue(wlandev->netdev);
- break;
+ case -EILSEQ: {
+ struct hfa384x *hw = wlandev->priv;
+
+ if (!test_and_set_bit
+ (THROTTLE_TX, &hw->usb_flags) &&
+ !timer_pending(&hw->throttle)) {
+ mod_timer(&hw->throttle,
+ jiffies + THROTTLE_JIFFIES);
}
+ wlandev->netdev->stats.tx_errors++;
+ netif_stop_queue(wlandev->netdev);
+ break;
+ }
case -ENOENT:
case -ESHUTDOWN:
diff --git a/drivers/staging/wlan-ng/p80211req.c
b/drivers/staging/wlan-ng/p80211req.c
index ab920d6a112b..9f5c1267d829 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -172,7 +172,7 @@ static void p80211req_handlemsg(struct wlandevice *wlandev,
struct p80211msg *msg)
{
switch (msg->msgcode) {
- case DIDMSG_LNXREQ_HOSTWEP:{
+ case DIDMSG_LNXREQ_HOSTWEP: {
struct p80211msg_lnxreq_hostwep *req =
(struct p80211msg_lnxreq_hostwep *)msg;
wlandev->hostwep &=
@@ -182,15 +182,15 @@ static void p80211req_handlemsg(struct wlandevice
*wlandev,
if (req->encrypt.data == P80211ENUM_truth_true)
wlandev->hostwep |= HOSTWEP_ENCRYPT;
- break;
+ break;
}
case DIDMSG_DOT11REQ_MIBGET:
- case DIDMSG_DOT11REQ_MIBSET:{
+ case DIDMSG_DOT11REQ_MIBSET: {
int isget = (msg->msgcode == DIDMSG_DOT11REQ_MIBGET);
struct p80211msg_dot11req_mibget *mib_msg =
(struct p80211msg_dot11req_mibget *)msg;
p80211req_mibset_mi
[PATCH v2 61/62] staging: wlan-ng: rejoin split lines shortened by case changes
The reformatting of case blocks has shortened some lines such that
previously split lines can be rejoined without exceeding 80
characters. Rejoined those lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x_usb.c | 6 ++
drivers/staging/wlan-ng/prism2sta.c | 17 ++---
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c
b/drivers/staging/wlan-ng/hfa384x_usb.c
index fb32aaf13628..6261881e9bcd 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3611,8 +3611,7 @@ static void hfa384x_usbout_callback(struct urb *urb)
netdev_warn(hw->wlandev->netdev,
"%s tx pipe stalled: requesting reset\n",
wlandev->netdev->name);
- if (!test_and_set_bit
- (WORK_TX_HALT, &hw->usb_flags))
+ if (!test_and_set_bit(WORK_TX_HALT, &hw->usb_flags))
schedule_work(&hw->usb_work);
wlandev->netdev->stats.tx_errors++;
break;
@@ -3623,8 +3622,7 @@ static void hfa384x_usbout_callback(struct urb *urb)
case -EILSEQ: {
struct hfa384x *hw = wlandev->priv;
- if (!test_and_set_bit
- (THROTTLE_TX, &hw->usb_flags) &&
+ if (!test_and_set_bit(THROTTLE_TX, &hw->usb_flags) &&
!timer_pending(&hw->throttle)) {
mod_timer(&hw->throttle,
jiffies + THROTTLE_JIFFIES);
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index b720f564ecde..fb5441399131 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -341,9 +341,8 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received mlme ifstate request\n");
ifstatemsg = (struct p80211msg_lnxreq_ifstate *)msg;
- result =
- prism2sta_ifstate(wlandev,
- ifstatemsg->ifstate.data);
+ result = prism2sta_ifstate(wlandev,
+ ifstatemsg->ifstate.data);
ifstatemsg->resultcode.status =
P80211ENUM_msgitem_status_data_ok;
ifstatemsg->resultcode.data = result;
@@ -365,16 +364,12 @@ static int prism2sta_mlmerequest(struct wlandevice
*wlandev,
qualmsg = (struct p80211msg_lnxreq_commsquality *)msg;
- qualmsg->link.status =
- P80211ENUM_msgitem_status_data_ok;
- qualmsg->level.status =
- P80211ENUM_msgitem_status_data_ok;
- qualmsg->noise.status =
- P80211ENUM_msgitem_status_data_ok;
+ qualmsg->link.status = P80211ENUM_msgitem_status_data_ok;
+ qualmsg->level.status = P80211ENUM_msgitem_status_data_ok;
+ qualmsg->noise.status = P80211ENUM_msgitem_status_data_ok;
qualmsg->link.data = le16_to_cpu(hw->qual.cq_curr_bss);
- qualmsg->level.data =
- le16_to_cpu(hw->qual.asl_curr_bss);
+ qualmsg->level.data = le16_to_cpu(hw->qual.asl_curr_bss);
qualmsg->noise.data = le16_to_cpu(hw->qual.anl_curr_fc);
qualmsg->txrate.data = hw->txrate;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/3] staging: wlan-ng: formatting changes
Formatting changes to resolve 80 character limit warnings reported by checkpatch. Tim Collier (3): staging: wlan-ng: formatting change in cfg80211.c staging: wlan-ng: reformatting in hfa384x.h to fit 80 character limit staging: wlan-ng: reformatting in prism2mib.c to fit 80 character limit drivers/staging/wlan-ng/cfg80211.c | 3 ++- drivers/staging/wlan-ng/hfa384x.h | 26 ++ drivers/staging/wlan-ng/prism2mib.c | 26 ++ 3 files changed, 34 insertions(+), 21 deletions(-) -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/3] staging: wlan-ng: reformatting in hfa384x.h to fit 80 character limit
Reformat lines over 80 characters in hfa384x.h to resolve "line over
80 characters" warnings reported by checkpatch.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x.h | 26 ++
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x.h
b/drivers/staging/wlan-ng/hfa384x.h
index 992ebaa1071f..4f2177d1e1bc 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -517,7 +517,8 @@ struct hfa384x_tx_frame {
HFA384x_TXSTATUS_DISCON | HFA384x_TXSTATUS_AGEDERR | \
HFA384x_TXSTATUS_RETRYERR))
-#defineHFA384x_TX_SET(v, m, s) u16)(v)) << ((u16)(s))) &
((u16)(m)))
+#defineHFA384x_TX_SET(v, m, s) \
+ u16)(v)) << ((u16)(s))) & ((u16)(m)))
#defineHFA384x_TX_MACPORT_SET(v) HFA384x_TX_SET(v,
HFA384x_TX_MACPORT, 8)
#defineHFA384x_TX_STRUCTYPE_SET(v) HFA384x_TX_SET(v, \
@@ -1092,7 +1093,8 @@ struct hfa384x_pdrec {
struct hfa384x_pdr_nicid nicid;
struct hfa384x_pdr_refdac_measurements refdac_measurements;
struct hfa384x_pdr_vgdac_measurements vgdac_measurements;
- struct hfa384x_pdr_level_comp_measurements
level_compc_measurements;
+ struct hfa384x_pdr_level_comp_measurements
+ level_compc_measurements;
struct hfa384x_pdr_mac_address mac_address;
struct hfa384x_pdr_mkk_callname mkk_callname;
struct hfa384x_pdr_regdomain regdomain;
@@ -1337,7 +1339,10 @@ struct hfa384x {
* interface
*/
- struct hfa384x_caplevel cap_act_sta_mfi; /* sta f/w to modem interface
*/
+ struct hfa384x_caplevel cap_act_sta_mfi; /*
+ * sta f/w to modem
+ * interface
+ */
struct hfa384x_caplevel cap_act_ap_cfi; /*
* ap f/w to controller
@@ -1359,7 +1364,10 @@ struct hfa384x {
struct hfa384x_inf_frame *scanresults;
- struct prism2sta_authlist authlist; /* Authenticated station list.
*/
+ struct prism2sta_authlist authlist; /*
+* Authenticated station
+* list.
+*/
unsigned int accessmode;/* Access mode. */
struct prism2sta_accesslist allow; /* Allowed station list. */
struct prism2sta_accesslist deny; /* Denied station list. */
@@ -1369,13 +1377,14 @@ struct hfa384x {
void hfa384x_create(struct hfa384x *hw, struct usb_device *usb);
void hfa384x_destroy(struct hfa384x *hw);
-int
-hfa384x_corereset(struct hfa384x *hw, int holdtime, int settletime, int
genesis);
+int hfa384x_corereset(struct hfa384x *hw,
+ int holdtime, int settletime, int genesis);
int hfa384x_drvr_disable(struct hfa384x *hw, u16 macport);
int hfa384x_drvr_enable(struct hfa384x *hw, u16 macport);
int hfa384x_drvr_flashdl_enable(struct hfa384x *hw);
int hfa384x_drvr_flashdl_disable(struct hfa384x *hw);
-int hfa384x_drvr_flashdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32
len);
+int hfa384x_drvr_flashdl_write(struct hfa384x *hw,
+ u32 daddr, void *buf, u32 len);
int hfa384x_drvr_getconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len);
int hfa384x_drvr_ramdl_enable(struct hfa384x *hw, u32 exeaddr);
int hfa384x_drvr_ramdl_disable(struct hfa384x *hw);
@@ -1383,7 +1392,8 @@ int hfa384x_drvr_ramdl_write(struct hfa384x *hw, u32
daddr, void *buf, u32 len);
int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len);
int hfa384x_drvr_setconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len);
-static inline int hfa384x_drvr_getconfig16(struct hfa384x *hw, u16 rid, void
*val)
+static inline int hfa384x_drvr_getconfig16(struct hfa384x *hw,
+ u16 rid, void *val)
{
int result = 0;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/3] staging: wlan-ng: reformatting in prism2mib.c to fit 80 character limit
Reformat lines over 80 characters in prism2mib.c to resolve "line over
80 characters" warnings reported by checkpatch.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/prism2mib.c | 26 ++
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 5c0dad42f523..1eba5fa28d8f 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -133,12 +133,13 @@ static int prism2mib_excludeunencrypted(struct mibrec
*mib,
struct p80211msg_dot11req_mibset *msg,
void *data);
-static int prism2mib_fragmentationthreshold(struct mibrec *mib,
- int isget,
- struct wlandevice *wlandev,
- struct hfa384x *hw,
- struct p80211msg_dot11req_mibset
*msg,
- void *data);
+static int
+prism2mib_fragmentationthreshold(struct mibrec *mib,
+int isget,
+struct wlandevice *wlandev,
+struct hfa384x *hw,
+struct p80211msg_dot11req_mibset *msg,
+void *data);
static int prism2mib_priv(struct mibrec *mib,
int isget,
@@ -652,12 +653,13 @@ static int prism2mib_excludeunencrypted(struct mibrec
*mib,
*
*/
-static int prism2mib_fragmentationthreshold(struct mibrec *mib,
- int isget,
- struct wlandevice *wlandev,
- struct hfa384x *hw,
- struct p80211msg_dot11req_mibset
*msg,
- void *data)
+static int
+prism2mib_fragmentationthreshold(struct mibrec *mib,
+int isget,
+struct wlandevice *wlandev,
+struct hfa384x *hw,
+struct p80211msg_dot11req_mibset *msg,
+void *data)
{
u32 *uint32 = data;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/3] staging: wlan-ng: formatting change in cfg80211.c
Resolve "line over 80 characters" warning reported by checkpatch by
splitting function header over 2 lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 47f2ee926a77..e5d7def1f366 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -678,7 +678,8 @@ static const struct cfg80211_ops prism2_usb_cfg_ops = {
};
/* Functions to create/free wiphy interface */
-static struct wiphy *wlan_create_wiphy(struct device *dev, struct wlandevice
*wlandev)
+static struct wiphy *wlan_create_wiphy(struct device *dev,
+ struct wlandevice *wlandev)
{
struct wiphy *wiphy;
struct prism2_wiphy_private *priv;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: wlan-ng: remove unused variable in prism2fw.c
Remove the unused crcend variable from the crcimage function.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/prism2fw.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/prism2fw.c
b/drivers/staging/wlan-ng/prism2fw.c
index a2c851c74bef..bb572b7fdfee 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -406,7 +406,6 @@ static int crcimage(struct imgchunk *fchunk, unsigned int
nfchunks,
int i;
int c;
u32 crcstart;
- u32 crcend;
u32 cstart = 0;
u32 cend;
u8 *dest;
@@ -416,7 +415,6 @@ static int crcimage(struct imgchunk *fchunk, unsigned int
nfchunks,
if (!s3crc[i].dowrite)
continue;
crcstart = s3crc[i].addr;
- crcend = s3crc[i].addr + s3crc[i].len;
/* Find chunk */
for (c = 0; c < nfchunks; c++) {
cstart = fchunk[c].addr;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/5] staging: wlan-ng: remove unnecessary casts from prism2usb.c
usb_get_intfdata returns a void pointer. It is not necessary to
explicitly cast to the desired type and removing the casts is
consistent with most use of usb_get_intfdata.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/prism2usb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/prism2usb.c
b/drivers/staging/wlan-ng/prism2usb.c
index b5ba176004c1..352556f6870a 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -137,7 +137,7 @@ static void prism2sta_disconnect_usb(struct usb_interface
*interface)
{
struct wlandevice *wlandev;
- wlandev = (struct wlandevice *)usb_get_intfdata(interface);
+ wlandev = usb_get_intfdata(interface);
if (wlandev) {
LIST_HEAD(cleanlist);
struct hfa384x_usbctlx *ctlx, *temp;
@@ -222,7 +222,7 @@ static int prism2sta_suspend(struct usb_interface
*interface,
struct hfa384x *hw = NULL;
struct wlandevice *wlandev;
- wlandev = (struct wlandevice *)usb_get_intfdata(interface);
+ wlandev = usb_get_intfdata(interface);
if (!wlandev)
return -ENODEV;
@@ -245,7 +245,7 @@ static int prism2sta_resume(struct usb_interface *interface)
struct hfa384x *hw = NULL;
struct wlandevice *wlandev;
- wlandev = (struct wlandevice *)usb_get_intfdata(interface);
+ wlandev = usb_get_intfdata(interface);
if (!wlandev)
return -ENODEV;
--
2.21.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/5] staging: wlan-ng: fix compilation for USB debugging
Fix compilation errors (remove references to 2 undefined fields in the
URB struct) when DEBUG_USB is defined for the wlan-ng driver.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x_usb.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c
b/drivers/staging/wlan-ng/hfa384x_usb.c
index 28d372a0663a..b71756ab0394 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -293,13 +293,11 @@ void dbprint_urb(struct urb *urb)
pr_debug("urb->transfer_buffer_length=0x%08x\n",
urb->transfer_buffer_length);
pr_debug("urb->actual_length=0x%08x\n", urb->actual_length);
- pr_debug("urb->bandwidth=0x%08x\n", urb->bandwidth);
pr_debug("urb->setup_packet(ctl)=0x%08x\n",
(unsigned int)urb->setup_packet);
pr_debug("urb->start_frame(iso/irq)=0x%08x\n", urb->start_frame);
pr_debug("urb->interval(irq)=0x%08x\n", urb->interval);
pr_debug("urb->error_count(iso)=0x%08x\n", urb->error_count);
- pr_debug("urb->timeout=0x%08x\n", urb->timeout);
pr_debug("urb->context=0x%08x\n", (unsigned int)urb->context);
pr_debug("urb->complete=0x%08x\n", (unsigned int)urb->complete);
}
--
2.21.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/5] staging: wlang-ng: coding style changes/cleanups
Remove unnecessary casts from void* to structure pointer. Fix compilation with DEBUG_USB macro defined. Remove unused field from usb ctlx structure. Formatting changes suggested by checkpatch. Tim Collier (5): staging: wlan-ng: remove unnecessary casts from prism2usb.c staging: wlan-ng: shorten lines over 80 characters in hfa384x.h staging: wlan-ng: correct parameter alignment in hfa384x.h staging: wlan-ng: fix compilation for USB debugging staging: wlan-ng: remove unused field from struct hfa384x_usbctlx drivers/staging/wlan-ng/hfa384x.h | 18 +++--- drivers/staging/wlan-ng/hfa384x_usb.c | 2 -- drivers/staging/wlan-ng/prism2usb.c | 6 +++--- 3 files changed, 14 insertions(+), 12 deletions(-) -- 2.21.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/5] staging: wlan-ng: correct parameter alignment in hfa384x.h
Realign parameter in function declaration to fix checkpatch.pl warning that parameter needed to be aligned with the opening parenthesis of the declaration. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/hfa384x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index 2d3d8b1e2c1b..86fd3fcd8a36 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h @@ -1374,7 +1374,7 @@ void hfa384x_create(struct hfa384x *hw, struct usb_device *usb); void hfa384x_destroy(struct hfa384x *hw); int hfa384x_corereset(struct hfa384x *hw, int holdtime, int settletime, - int genesis); + int genesis); int hfa384x_drvr_disable(struct hfa384x *hw, u16 macport); int hfa384x_drvr_enable(struct hfa384x *hw, u16 macport); int hfa384x_drvr_flashdl_enable(struct hfa384x *hw); -- 2.21.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 5/5] staging: wlan-ng: remove unused field from struct hfa384x_usbctlx
The variant field in struct hfa384x_usbctlx is not referenced anywhere
in the driver, so remove it.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x.h
b/drivers/staging/wlan-ng/hfa384x.h
index 86fd3fcd8a36..bdd7f414fdbb 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -1181,8 +1181,6 @@ struct hfa384x_usbctlx {
ctlx_cmdcb_t cmdcb; /* Async command callback */
ctlx_usercb_t usercb; /* Async user callback, */
void *usercb_data; /* at CTLX completion */
-
- int variant;/* Identifies cmd variant */
};
struct hfa384x_usbctlxq {
--
2.21.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/5] staging: wlan-ng: shorten lines over 80 characters in hfa384x.h
Shorten several lines reported as over 80 characters by checkpatch.pl.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x.h | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x.h
b/drivers/staging/wlan-ng/hfa384x.h
index 5ff740a8837d..2d3d8b1e2c1b 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -1337,7 +1337,9 @@ struct hfa384x {
* interface
*/
- struct hfa384x_caplevel cap_act_sta_mfi; /* sta f/w to modem interface
*/
+ struct hfa384x_caplevel cap_act_sta_mfi; /*
+ * sta f/w to modem interface
+ */
struct hfa384x_caplevel cap_act_ap_cfi; /*
* ap f/w to controller
@@ -1359,7 +1361,9 @@ struct hfa384x {
struct hfa384x_inf_frame *scanresults;
- struct prism2sta_authlist authlist; /* Authenticated station list.
*/
+ struct prism2sta_authlist authlist; /*
+* Authenticated station list.
+*/
unsigned int accessmode;/* Access mode. */
struct prism2sta_accesslist allow; /* Allowed station list. */
struct prism2sta_accesslist deny; /* Denied station list. */
@@ -1375,7 +1379,8 @@ int hfa384x_drvr_disable(struct hfa384x *hw, u16 macport);
int hfa384x_drvr_enable(struct hfa384x *hw, u16 macport);
int hfa384x_drvr_flashdl_enable(struct hfa384x *hw);
int hfa384x_drvr_flashdl_disable(struct hfa384x *hw);
-int hfa384x_drvr_flashdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32
len);
+int hfa384x_drvr_flashdl_write(struct hfa384x *hw, u32 daddr, void *buf,
+ u32 len);
int hfa384x_drvr_getconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len);
int hfa384x_drvr_ramdl_enable(struct hfa384x *hw, u32 exeaddr);
int hfa384x_drvr_ramdl_disable(struct hfa384x *hw);
@@ -1383,7 +1388,8 @@ int hfa384x_drvr_ramdl_write(struct hfa384x *hw, u32
daddr, void *buf, u32 len);
int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len);
int hfa384x_drvr_setconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len);
-static inline int hfa384x_drvr_getconfig16(struct hfa384x *hw, u16 rid, void
*val)
+static inline int
+hfa384x_drvr_getconfig16(struct hfa384x *hw, u16 rid, void *val)
{
int result = 0;
--
2.21.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: wlan-ng: fix adapter initialization failure
Commit e895f00a8496 ("Staging: wlan-ng: hfa384x_usb.c Fixed too long
code line warnings.") moved the retrieval of the transfer buffer from
the URB from the top of function hfa384x_usbin_callback to a point
after reposting of the URB via a call to submit_rx_urb. The reposting
of the URB allocates a new transfer buffer so the new buffer is
retrieved instead of the buffer containing the response passed into
the callback. This results in failure to initialize the adapter with
an error reported in the system log (something like "CTLX[1] error:
state(Request failed)").
This change moves the retrieval to just before the point where the URB
is reposted so that the correct transfer buffer is retrieved and
initialization of the device succeeds.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x_usb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c
b/drivers/staging/wlan-ng/hfa384x_usb.c
index 6fde75d4f064..ab734534093b 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3119,7 +3119,9 @@ static void hfa384x_usbin_callback(struct urb *urb)
break;
}
+ /* Save values from the RX URB before reposting overwrites it. */
urb_status = urb->status;
+ usbin = (union hfa384x_usbin *)urb->transfer_buffer;
if (action != ABORT) {
/* Repost the RX URB */
@@ -3136,7 +3138,6 @@ static void hfa384x_usbin_callback(struct urb *urb)
/* Note: the check of the sw_support field, the type field doesn't
* have bit 12 set like the docs suggest.
*/
- usbin = (union hfa384x_usbin *)urb->transfer_buffer;
type = le16_to_cpu(usbin->type);
if (HFA384x_USB_ISRXFRM(type)) {
if (action == HANDLE) {
--
2.20.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/3] staging: wlan-ng: fix coding style issues
Fix issues reported by checkpatch regarding the correct point to split lines for coninuation and unnecessary parentheses. Tim Collier (3): staging: wlan-ng: fix expression continuation in prism2fw.c staging: wlan-ng: fix expression continuation in prism2mgmt.c staging: wlan-ng: remove unneeded parentheses from prism2mgmt.c drivers/staging/wlan-ng/prism2fw.c | 7 --- drivers/staging/wlan-ng/prism2mgmt.c | 18 +- 2 files changed, 13 insertions(+), 12 deletions(-) -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/3] staging: wlan-ng: fix expression continuation in prism2fw.c
checkpatch reports "CHECK: Logical continuations should be on the
previous line" when a continuation line begins with an
operator. Reformat the code so that the operator appears at the end of
the line being continued.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/prism2fw.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlan-ng/prism2fw.c
b/drivers/staging/wlan-ng/prism2fw.c
index 5860d0d65841..4fb91294570d 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -1189,9 +1189,10 @@ static int validate_identity(void)
/* PRI compat range */
if ((s3info[i].info.compat.role == 1) &&
(s3info[i].info.compat.id == 3)) {
- if ((s3info[i].info.compat.bottom > priid.top)
- || (s3info[i].info.compat.top <
- priid.bottom)) {
+ if ((s3info[i].info.compat.bottom >
+priid.top) ||
+ (s3info[i].info.compat.top <
+priid.bottom)) {
result = 3;
}
}
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/3] staging: wlan-ng: fix expression continuation in prism2mgmt.c
checkpatch reports "CHECK: Logical continuations should be on the
previous line" when a continuation line begins with an
operator. Reformat the code so that the operator appears at the end of
the line being continued.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/prism2mgmt.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c
b/drivers/staging/wlan-ng/prism2mgmt.c
index ebfe69b138c7..13fff7b19fb6 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -1269,9 +1269,8 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void
*msgp)
goto failed;
}
if ((msg->keepwepflags.status ==
-P80211ENUM_msgitem_status_data_ok)
- && (msg->keepwepflags.data !=
- P80211ENUM_truth_true)) {
+P80211ENUM_msgitem_status_data_ok) &&
+ (msg->keepwepflags.data != P80211ENUM_truth_true)) {
/* Set the wepflags for no decryption */
word = HFA384x_WEPFLAGS_DISABLE_TXCRYPT |
HFA384x_WEPFLAGS_DISABLE_RXCRYPT;
@@ -1291,8 +1290,9 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void
*msgp)
}
/* Do we want to strip the FCS in monitor mode? */
- if ((msg->stripfcs.status == P80211ENUM_msgitem_status_data_ok)
- && (msg->stripfcs.data == P80211ENUM_truth_true)) {
+ if ((msg->stripfcs.status ==
+P80211ENUM_msgitem_status_data_ok) &&
+ (msg->stripfcs.data == P80211ENUM_truth_true)) {
hw->sniff_fcs = 0;
} else {
hw->sniff_fcs = 1;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/3] staging: wlan-ng: remove unneeded parentheses from prism2mgmt.c
remove parentheses reported as unnecessary by checkpatch
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/prism2mgmt.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c
b/drivers/staging/wlan-ng/prism2mgmt.c
index 13fff7b19fb6..7350fe5d96a3 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -414,7 +414,7 @@ int prism2mgmt_scan_results(struct wlandevice *wlandev,
void *msgp)
goto exit;
}
- item = &(hw->scanresults->info.hscanresult.result[req->bssindex.data]);
+ item = &hw->scanresults->info.hscanresult.result[req->bssindex.data];
/* signal and noise */
req->signal.status = P80211ENUM_msgitem_status_data_ok;
req->noise.status = P80211ENUM_msgitem_status_data_ok;
@@ -1075,7 +1075,7 @@ int prism2mgmt_autojoin(struct wlandevice *wlandev, void
*msgp)
/* Set the ssid */
memset(bytebuf, 0, 256);
- pstr = (struct p80211pstrd *)&(msg->ssid.data);
+ pstr = (struct p80211pstrd *)&msg->ssid.data;
prism2mgmt_pstr2bytestr(p2bytestr, pstr);
result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFDESIREDSSID,
bytebuf,
@@ -1199,7 +1199,7 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void
*msgp)
/* Save macport 0 state */
result = hfa384x_drvr_getconfig16(hw,
HFA384x_RID_CNFPORTTYPE,
- &(hw->presniff_port_type));
+ &hw->presniff_port_type);
if (result) {
netdev_dbg
(wlandev->netdev,
@@ -1210,7 +1210,7 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void
*msgp)
/* Save the wepflags state */
result = hfa384x_drvr_getconfig16(hw,
HFA384x_RID_CNFWEPFLAGS,
- &(hw->presniff_wepflags));
+ &hw->presniff_wepflags);
if (result) {
netdev_dbg
(wlandev->netdev,
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/2] staging: wlan-ng: coding style change and comment update
Apply a coding style change suggested by checkpatch and correct a comment. Tim Collier (2): staging: wlan-ng: remove volatile from reapable field in hfa384x_usbctlx staging: wlan-ng: correction to comment in hfa384x_usb drivers/staging/wlan-ng/hfa384x.h | 2 +- drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/2] staging: wlan-ng: correction to comment in hfa384x_usb
The comment for hfa384x_docmd incorrectly states that usercb_data should be NULL for DOASYNC calls; in fact, it should be NULL for DOWAIT calls (this is consistent with the other similar functions and the rest of the comment text). Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 33e97ffbb436..16f7dd266e3b 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c @@ -1290,7 +1290,7 @@ static int hfa384x_usbctlx_complete_sync(struct hfa384x *hw, * cmdcb command-specific callback * usercb user callback for async calls, NULL for DOWAIT calls * usercb_data user supplied data pointer for async calls, NULL - * for DOASYNC calls + * for DOWAIT calls * * Returns: * 0 success -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/2] staging: wlan-ng: remove volatile from reapable field in hfa384x_usbctlx
Fix checkpatch.pl warning:
"Use of volatile is usually wrong: see
Documentation/process/volatile-considered-harmful.rs"
reapable is not used to access h/w directly, so volatile is not
necessary.
>From reading the code, the contexts in which the field may be
updated/accessed across threads are protected by the hw->ctlxq.lock
spinlock, where hw is the device struct, so appears thread-safe.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wlan-ng/hfa384x.h
b/drivers/staging/wlan-ng/hfa384x.h
index 67a944c0d690..992ebaa1071f 100644
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -1176,7 +1176,7 @@ struct hfa384x_usbctlx {
enum ctlx_state state; /* Tracks running state */
struct completion done;
- volatile int reapable; /* Food for the reaper task */
+ int reapable; /* Food for the reaper task */
ctlx_cmdcb_t cmdcb; /* Async command callback */
ctlx_usercb_t usercb; /* Async user callback, */
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: wlan-ng: remove unused definitions from p80211types.h
Remove the following unused definitions from p80211types.h:
* struct p80211enum
* struct p80211enumpair
* struct catlistitem declaration and associated function pointer
typedefs (along with preceding block comment)
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211types.h | 27 ---
1 file changed, 27 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211types.h
b/drivers/staging/wlan-ng/p80211types.h
index 7c37d56dd9b7..ac254542fde6 100644
--- a/drivers/staging/wlan-ng/p80211types.h
+++ b/drivers/staging/wlan-ng/p80211types.h
@@ -194,20 +194,6 @@
P80211DID_LSB_ACCESS)
/**/
-/* The following structure types are used for the representation */
-/* of ENUMint type metadata. */
-
-struct p80211enumpair {
- u32 val;
- char *name;
-};
-
-struct p80211enum {
- int nitems;
- struct p80211enumpair *list;
-};
-
-/**/
/* The following structure types are used to store data items in */
/* messages. */
@@ -330,17 +316,4 @@ struct p80211item_unk4096 {
u8 data[4096];
} __packed;
-struct catlistitem;
-
-/**/
-/* The following structure type is used to represent all of the */
-/* metadata items. Some components may choose to use more, */
-/* less or different metadata items. */
-
-typedef void (*p80211_totext_t) (struct catlistitem *, u32 did, u8 *itembuf,
-char *textbuf);
-typedef void (*p80211_fromtext_t) (struct catlistitem *, u32 did, u8 *itembuf,
- char *textbuf);
-typedef u32(*p80211_valid_t) (struct catlistitem *, u32 did, u8 *itembuf);
-
#endif /* _P80211TYPES_H */
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 00/12] staging: wlan-ng: coding style changes/cleanups
Remove redundant code "commented" out with #if 0 to remove checkpatch warnings. Switch to all-upper or all-lower (for function-style) case names for macros in p80211metadef.h to silence checkpatch messages and match the coding guidelines. Shorten names that have repeated elements. Rejoin lines split to keep within 80 characters that now fit due to shortened names. Make the use of braced blocks in switch cases consistent across the driver by always using K&R style, braces at the case level and a single indent. Rejoin split lines that now fit within 80 characters due to reduced indentation. Cleanup unneeded braces on a single line if statement. Remove the comments stating that p80211metadef.h and p80211metastruct.h are automatically generated and should not be edited; neither file has a mechanism for generation and both have been manually edited and updated in version control multiple times. Patches should be applied in order as there are some dependencies. Tim Collier (12): staging: wlan-ng: remove redundant code in "#if 0" blocks staging: wlan-ng: avoid use of camel case macro names in p80211metadef.h staging: wlan-ng: shorten names of "DIDMIB_DOT11SMT_" macros staging: wlan-ng: shorten names of "DIDMIB_DOT11MAC_" macros staging: wlan-ng: shorten names of "DIDMIB_DOT11PHY_" macros staging: wlan-ng: shorten names of "DIDMIB_LNX_" macros staging: wlan-ng: shorten names of "DIDMIB_P2_" macros staging: wlan-ng: formatting cleanup in cfg80211.c staging: wlan-ng: make switch case block format consistent staging: wlan-ng: rejoin split lines shortened by case changes staging: wlan-ng: remove unnecessary braces from if staging: wlan-ng: remove "autogenerated code" comments drivers/staging/wlan-ng/cfg80211.c | 49 ++-- drivers/staging/wlan-ng/hfa384x_usb.c | 47 +-- drivers/staging/wlan-ng/p80211metadef.h| 121 ++--- drivers/staging/wlan-ng/p80211metastruct.h | 3 +- drivers/staging/wlan-ng/p80211netdev.c | 12 +-- drivers/staging/wlan-ng/p80211req.c| 37 - drivers/staging/wlan-ng/prism2fw.c | 37 - drivers/staging/wlan-ng/prism2mib.c| 76 +- drivers/staging/wlan-ng/prism2sta.c| 86 ++-- 9 files changed, 224 insertions(+), 244 deletions(-) -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 01/12] staging: wlan-ng: remove redundant code in "#if 0" blocks
Remove two blocks of code that checkpatch identified as redundant
because they were enclosed in "#if...#endif". In the case of
prism2fw.c the associated "TODO" comment was retained.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211netdev.c | 4
drivers/staging/wlan-ng/prism2fw.c | 5 +
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211netdev.c
b/drivers/staging/wlan-ng/p80211netdev.c
index 8258cb5a335d..ae98ac1dd434 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -927,10 +927,6 @@ static int p80211_rx_typedrop(struct wlandevice *wlandev,
u16 fc)
/* Classify frame, increment counter */
ftype = WLAN_GET_FC_FTYPE(fc);
fstype = WLAN_GET_FC_FSTYPE(fc);
-#if 0
- netdev_dbg(wlandev->netdev, "rx_typedrop : ftype=%d fstype=%d.\n",
- ftype, fstype);
-#endif
switch (ftype) {
case WLAN_FTYPE_MGMT:
if ((wlandev->netdev->flags & IFF_PROMISC) ||
diff --git a/drivers/staging/wlan-ng/prism2fw.c
b/drivers/staging/wlan-ng/prism2fw.c
index 4fb91294570d..ddcaac648bd5 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -706,7 +706,7 @@ static int plugimage(struct imgchunk *fchunk, unsigned int
nfchunks,
pr_warn("warning: Failed to find PDR for plugrec
0x%04x.\n",
s3plug[i].itemcode);
continue; /* and move on to the next PDR */
-#if 0
+
/* MSM: They swear that unless it's the MAC address,
* the serial number, or the TX calibration records,
* then there's reasonable defaults in the f/w
@@ -714,9 +714,6 @@ static int plugimage(struct imgchunk *fchunk, unsigned int
nfchunks,
* should only be a warning, not fatal.
* TODO: add fatals for the PDRs mentioned above.
*/
- result = 1;
- continue;
-#endif
}
/* Validate plug len against PDR len */
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 02/12] staging: wlan-ng: avoid use of camel case macro names in p80211metadef.h
checkpatch reported a number of "Avoid CamelCase" issues for macros defined in p80211metadef.h (and for files that used these macros). Renamed the macros to all upper-case (except for DIDmib_dot11smt_dot11WEPDefaultKeysTable_key, a function-like macro, which was renamed to all lower-case) to conform to the coding guidelines. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/cfg80211.c | 48 ++--- drivers/staging/wlan-ng/p80211metadef.h | 118 drivers/staging/wlan-ng/p80211netdev.c | 8 +-- drivers/staging/wlan-ng/p80211req.c | 27 drivers/staging/wlan-ng/prism2fw.c | 32 - drivers/staging/wlan-ng/prism2mib.c | 40 +-- drivers/staging/wlan-ng/prism2sta.c | 34 - 7 files changed, 154 insertions(+), 153 deletions(-) diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c index d4cf09b11e33..9cab95fca5ea 100644 --- a/drivers/staging/wlan-ng/cfg80211.c +++ b/drivers/staging/wlan-ng/cfg80211.c @@ -76,7 +76,7 @@ static int prism2_domibset_uint32(struct wlandevice *wlandev, u32 did, u32 data) struct p80211item_uint32 *mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data; - msg.msgcode = DIDmsg_dot11req_mibset; + msg.msgcode = DIDMSG_DOT11REQ_MIBSET; mibitem->did = did; mibitem->data = data; @@ -90,7 +90,7 @@ static int prism2_domibset_pstr32(struct wlandevice *wlandev, struct p80211item_pstr32 *mibitem = (struct p80211item_pstr32 *)&msg.mibattribute.data; - msg.msgcode = DIDmsg_dot11req_mibset; + msg.msgcode = DIDMSG_DOT11REQ_MIBSET; mibitem->did = did; mibitem->data.len = len; memcpy(mibitem->data.data, data, len); @@ -129,7 +129,7 @@ static int prism2_change_virtual_intf(struct wiphy *wiphy, /* Set Operation mode to the PORT TYPE RID */ result = prism2_domibset_uint32(wlandev, - DIDmib_p2_p2Static_p2CnfPortType, + DIDMIB_P2_P2STATIC_P2CNFPORTTYPE, data); if (result) @@ -158,12 +158,12 @@ static int prism2_add_key(struct wiphy *wiphy, struct net_device *dev, } if (prism2_domibset_uint32(wlandev, - DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID, + DIDMIB_DOT11SMT_DOT11PRIVACYTABLE_DOT11WEPDEFAULTKEYID, key_index)) return -EFAULT; /* send key to driver */ - did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(key_index + 1); + did = didmib_dot11smt_dot11wepdefaultkeystable_key(key_index + 1); if (prism2_domibset_pstr32(wlandev, did, params->key_len, params->key)) return -EFAULT; @@ -216,7 +216,7 @@ static int prism2_del_key(struct wiphy *wiphy, struct net_device *dev, return -EINVAL; /* send key to driver */ - did = DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(key_index + 1); + did = didmib_dot11smt_dot11wepdefaultkeystable_key(key_index + 1); result = prism2_domibset_pstr32(wlandev, did, 13, "0"); if (result) @@ -234,7 +234,7 @@ static int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev, int result = 0; result = prism2_domibset_uint32(wlandev, - DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID, + DIDMIB_DOT11SMT_DOT11PRIVACYTABLE_DOT11WEPDEFAULTKEYID, key_index); if (result) @@ -256,7 +256,7 @@ static int prism2_get_station(struct wiphy *wiphy, struct net_device *dev, return -EOPNOTSUPP; /* build request message */ - quality.msgcode = DIDmsg_lnxreq_commsquality; + quality.msgcode = DIDMSG_LNXREQ_COMMSQUALITY; quality.dbm.data = P80211ENUM_truth_true; quality.dbm.status = P80211ENUM_msgitem_status_data_ok; @@ -311,7 +311,7 @@ static int prism2_scan(struct wiphy *wiphy, priv->scan_request = request; memset(&msg1, 0x00, sizeof(msg1)); - msg1.msgcode = DIDmsg_dot11req_scan; + msg1.msgcode = DIDMSG_DOT11REQ_SCAN; msg1.bsstype.data = P80211ENUM_bsstype_any; memset(&msg1.bssid.data.data, 0xFF, sizeof(msg1.bssid.data.data)); @@ -350,7 +350,7 @@ static int prism2_scan(struct wiphy *wiphy, int freq; memset(&msg2, 0, sizeof(msg2)); - msg2.msgcode = DIDmsg_dot11req_scan_results; + msg2.msgcode = DIDMSG_DOT11REQ_SCAN_RESULTS; msg2.bssindex.data = i; result = p80211req_dorequest(wlandev, (u8 *)&msg2); @@ -410,7 +410,7 @@ static int prism2_set_wiphy_params(struct wiphy *wiph
[PATCH 04/12] staging: wlan-ng: shorten names of "DIDMIB_DOT11MAC_" macros
Shorten the names of the p80211metadef.h macros prefixed with
"DIDMIB_DOT11MAC_" by removing repeat use of "DOT11" to reduce long
lines and ease readabbility.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 4 ++--
drivers/staging/wlan-ng/p80211metadef.h | 14 +++---
drivers/staging/wlan-ng/p80211netdev.c | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 12 ++--
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 8a1f62d22cf4..b4d06fcc1882 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -410,7 +410,7 @@ static int prism2_set_wiphy_params(struct wiphy *wiphy, u32
changed)
data = wiphy->rts_threshold;
result = prism2_domibset_uint32(wlandev,
-
DIDMIB_DOT11MAC_DOT11OPERATIONTABLE_DOT11RTSTHRESHOLD,
+
DIDMIB_DOT11MAC_OPERATIONTABLE_RTSTHRESHOLD,
data);
if (result) {
err = -EFAULT;
@@ -425,7 +425,7 @@ static int prism2_set_wiphy_params(struct wiphy *wiphy, u32
changed)
data = wiphy->frag_threshold;
result = prism2_domibset_uint32(wlandev,
-
DIDMIB_DOT11MAC_DOT11OPERATIONTABLE_DOT11FRAGMENTATIONTHRESHOLD,
+
DIDMIB_DOT11MAC_OPERATIONTABLE_FRAGMENTATIONTHRESHOLD,
data);
if (result) {
err = -EFAULT;
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index e3dacf6d0a9a..199ea372502c 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -174,30 +174,30 @@
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(4) | 0x1800)
-#define DIDMIB_DOT11MAC_DOT11OPERATIONTABLE \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1))
-#define DIDMIB_DOT11MAC_DOT11OPERATIONTABLE_DOT11MACADDRESS \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_MACADDRESS \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(1) | 0x1800)
-#define DIDMIB_DOT11MAC_DOT11OPERATIONTABLE_DOT11RTSTHRESHOLD \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_RTSTHRESHOLD \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(2) | 0x1800)
-#define DIDMIB_DOT11MAC_DOT11OPERATIONTABLE_DOT11SHORTRETRYLIMIT \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_SHORTRETRYLIMIT \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(3) | 0x1000)
-#define DIDMIB_DOT11MAC_DOT11OPERATIONTABLE_DOT11LONGRETRYLIMIT \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_LONGRETRYLIMIT \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(4) | 0x1000)
-#define DIDMIB_DOT11MAC_DOT11OPERATIONTABLE_DOT11FRAGMENTATIONTHRESHOLD \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_FRAGMENTATIONTHRESHOLD \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(5) | 0x1800)
-#define DIDMIB_DOT11MAC_DOT11OPERATIONTABLE_DOT11MAXTRANSMITMSDULIFETIME \
+#define DIDMIB_DOT11MAC_OPERATIONTABLE_MAXTRANSMITMSDULIFETIME \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(6) | 0x1000)
diff --git a/drivers/staging/wlan-ng/p80211netdev.c
b/drivers/staging/wlan-ng/p80211netdev.c
index aa125f3e10e0..a70fb84f38f1 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -649,7 +649,7 @@ static int p80211knetdev_set_mac_address(struct net_device
*dev, void *addr)
mibattr->status = P80211ENUM_msgitem_status_data_ok;
mibattr->len = sizeof(mibattr->data);
- macaddr->did = DIDMIB_DOT11MAC_DOT11OPERATIONTABLE_DOT11MACADDRESS;
+ macaddr->did = DIDMIB_DOT11MAC_OPERATIONTABLE_MACADDRESS;
macaddr->status = P80211ENUM_msgitem_status_data_ok;
macaddr->len = sizeof(macaddr->data);
macaddr->data.len = ETH_ALEN;
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index af37b52f301e..9cc528114371 100644
--- a/drivers/staging/wlan-ng/
[PATCH 05/12] staging: wlan-ng: shorten names of "DIDMIB_DOT11PHY_" macros
Shorten the names of the p80211metadef.h macros prefixed with
"DIDMIB_DOT11PHY_" by removing repeat use of "DOT11PHY" and "DOT11" to
reduce long lines and ease readabbility.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 6 +++---
drivers/staging/wlan-ng/p80211metadef.h | 8
drivers/staging/wlan-ng/prism2mib.c | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index b4d06fcc1882..9ceb1727030d 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -455,7 +455,7 @@ static int prism2_connect(struct wiphy *wiphy, struct
net_device *dev,
if (channel) {
chan = ieee80211_frequency_to_channel(channel->center_freq);
result = prism2_domibset_uint32(wlandev,
-
DIDMIB_DOT11PHY_DOT11PHYDSSSTABLE_DOT11CURRENTCHANNEL,
+
DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL,
chan);
if (result)
goto exit;
@@ -595,7 +595,7 @@ static int prism2_set_tx_power(struct wiphy *wiphy, struct
wireless_dev *wdev,
data = MBM_TO_DBM(mbm);
result = prism2_domibset_uint32(wlandev,
- DIDMIB_DOT11PHY_DOT11PHYTXPOWERTABLE_DOT11CURRENTTXPOWERLEVEL,
+ DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL,
data);
if (result) {
@@ -620,7 +620,7 @@ static int prism2_get_tx_power(struct wiphy *wiphy, struct
wireless_dev *wdev,
mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data;
msg.msgcode = DIDMSG_DOT11REQ_MIBGET;
mibitem->did =
- DIDMIB_DOT11PHY_DOT11PHYTXPOWERTABLE_DOT11CURRENTTXPOWERLEVEL;
+ DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL;
result = p80211req_dorequest(wlandev, (u8 *)&msg);
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index 199ea372502c..ec37d2ae16c6 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -203,17 +203,17 @@
P80211DID_MKITEM(6) | 0x1000)
#define DIDMIB_CAT_DOT11PHY \
P80211DID_MKSECTION(3)
-#define DIDMIB_DOT11PHY_DOT11PHYOPERATIONTABLE \
+#define DIDMIB_DOT11PHY_OPERATIONTABLE \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(1))
-#define DIDMIB_DOT11PHY_DOT11PHYTXPOWERTABLE_DOT11CURRENTTXPOWERLEVEL \
+#define DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(10) | 0x1800)
-#define DIDMIB_DOT11PHY_DOT11PHYDSSSTABLE \
+#define DIDMIB_DOT11PHY_DSSSTABLE \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(5))
-#define DIDMIB_DOT11PHY_DOT11PHYDSSSTABLE_DOT11CURRENTCHANNEL \
+#define DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL \
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(5) | \
P80211DID_MKITEM(1) | 0x1000)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 9cc528114371..35575b434a59 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -206,11 +206,11 @@ static struct mibrec mibtab[] = {
/* dot11phy MIB's */
- {DIDMIB_DOT11PHY_DOT11PHYDSSSTABLE_DOT11CURRENTCHANNEL,
+ {DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL,
F_STA | F_READ,
HFA384x_RID_CURRENTCHANNEL, 0, 0,
prism2mib_uint32},
- {DIDMIB_DOT11PHY_DOT11PHYTXPOWERTABLE_DOT11CURRENTTXPOWERLEVEL,
+ {DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL,
F_STA | F_READ | F_WRITE,
HFA384x_RID_TXPOWERMAX, 0, 0,
prism2mib_uint32},
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 03/12] staging: wlan-ng: shorten names of "DIDMIB_DOT11SMT_" macros
Shorten the names of the p80211metadef.h macros prefixed with "DIDMIB_DOT11SMT_" (also in lower-case) by removing repeat use of "DOT11" to reduce long lines and ease readabbility. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/cfg80211.c | 20 ++-- drivers/staging/wlan-ng/p80211metadef.h | 14 +++--- drivers/staging/wlan-ng/p80211req.c | 14 +++--- drivers/staging/wlan-ng/prism2mib.c | 14 +++--- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c index 9cab95fca5ea..8a1f62d22cf4 100644 --- a/drivers/staging/wlan-ng/cfg80211.c +++ b/drivers/staging/wlan-ng/cfg80211.c @@ -158,12 +158,12 @@ static int prism2_add_key(struct wiphy *wiphy, struct net_device *dev, } if (prism2_domibset_uint32(wlandev, - DIDMIB_DOT11SMT_DOT11PRIVACYTABLE_DOT11WEPDEFAULTKEYID, + DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID, key_index)) return -EFAULT; /* send key to driver */ - did = didmib_dot11smt_dot11wepdefaultkeystable_key(key_index + 1); + did = didmib_dot11smt_wepdefaultkeystable_key(key_index + 1); if (prism2_domibset_pstr32(wlandev, did, params->key_len, params->key)) return -EFAULT; @@ -216,7 +216,7 @@ static int prism2_del_key(struct wiphy *wiphy, struct net_device *dev, return -EINVAL; /* send key to driver */ - did = didmib_dot11smt_dot11wepdefaultkeystable_key(key_index + 1); + did = didmib_dot11smt_wepdefaultkeystable_key(key_index + 1); result = prism2_domibset_pstr32(wlandev, did, 13, "0"); if (result) @@ -234,7 +234,7 @@ static int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev, int result = 0; result = prism2_domibset_uint32(wlandev, - DIDMIB_DOT11SMT_DOT11PRIVACYTABLE_DOT11WEPDEFAULTKEYID, + DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID, key_index); if (result) @@ -482,13 +482,13 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev, } result = prism2_domibset_uint32(wlandev, - DIDMIB_DOT11SMT_DOT11PRIVACYTABLE_DOT11WEPDEFAULTKEYID, + DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID, sme->key_idx); if (result) goto exit; /* send key to driver */ - did = didmib_dot11smt_dot11wepdefaultkeystable_key( + did = didmib_dot11smt_wepdefaultkeystable_key( sme->key_idx + 1); result = prism2_domibset_pstr32(wlandev, did, sme->key_len, @@ -502,13 +502,13 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev, * seems reasonable anyways */ result = prism2_domibset_uint32(wlandev, - DIDMIB_DOT11SMT_DOT11PRIVACYTABLE_DOT11PRIVACYINVOKED, + DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED, P80211ENUM_truth_true); if (result) goto exit; result = prism2_domibset_uint32(wlandev, - DIDMIB_DOT11SMT_DOT11PRIVACYTABLE_DOT11EXCLUDEUNENCRYPTED, + DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED, P80211ENUM_truth_true); if (result) goto exit; @@ -518,13 +518,13 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev, * and exclude unencrypted */ result = prism2_domibset_uint32(wlandev, - DIDMIB_DOT11SMT_DOT11PRIVACYTABLE_DOT11PRIVACYINVOKED, + DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED, P80211ENUM_truth_false); if (result) goto exit; result = prism2_domibset_uint32(wlandev, - DIDMIB_DOT11SMT_DOT11PRIVACYTABLE_DOT11EXCLUDEUNENCRYPTED, + DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED, P80211ENUM_truth_false); if (result) go
[PATCH 06/12] staging: wlan-ng: shorten names of "DIDMIB_LNX_" macros
Shorten the names of the p80211metadef.h macros prefixed with
"DIDMIB_LNX_" by removing repeat use of "LNX" to reduce long lines and
ease readabbility.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/p80211metadef.h | 4 ++--
drivers/staging/wlan-ng/prism2mib.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index ec37d2ae16c6..ea0113765e40 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -219,10 +219,10 @@
P80211DID_MKITEM(1) | 0x1000)
#define DIDMIB_CAT_LNX \
P80211DID_MKSECTION(4)
-#define DIDMIB_LNX_LNXCONFIGTABLE \
+#define DIDMIB_LNX_CONFIGTABLE \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1))
-#define DIDMIB_LNX_LNXCONFIGTABLE_LNXRSNAIE \
+#define DIDMIB_LNX_CONFIGTABLE_RSNAIE \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(1) | 0x1800)
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 35575b434a59..427805eebd84 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -230,7 +230,7 @@ static struct mibrec mibtab[] = {
prism2mib_uint32},
/* And finally, lnx mibs */
- {DIDMIB_LNX_LNXCONFIGTABLE_LNXRSNAIE,
+ {DIDMIB_LNX_CONFIGTABLE_RSNAIE,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWPADATA, 0, 0,
prism2mib_priv},
@@ -707,7 +707,7 @@ static int prism2mib_priv(struct mibrec *mib,
struct p80211pstrd *pstr = data;
switch (mib->did) {
- case DIDMIB_LNX_LNXCONFIGTABLE_LNXRSNAIE:{
+ case DIDMIB_LNX_CONFIGTABLE_RSNAIE:{
struct hfa384x_wpa_data wpa;
if (isget) {
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 08/12] staging: wlan-ng: formatting cleanup in cfg80211.c
Combine previously split lines for an assignment; now fits in 80 characters as the name of the macro being assigned was shortened. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/cfg80211.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c index a2f1136b97fa..47f2ee926a77 100644 --- a/drivers/staging/wlan-ng/cfg80211.c +++ b/drivers/staging/wlan-ng/cfg80211.c @@ -619,8 +619,7 @@ static int prism2_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data; msg.msgcode = DIDMSG_DOT11REQ_MIBGET; - mibitem->did = - DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL; + mibitem->did = DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL; result = p80211req_dorequest(wlandev, (u8 *)&msg); -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 10/12] staging: wlan-ng: rejoin split lines shortened by case changes
The reformatting of case blocks has shortened some lines such that
previously split lines can be rejoined without exceeding 80
characters. Rejoined those lines.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x_usb.c | 6 ++
drivers/staging/wlan-ng/prism2sta.c | 17 ++---
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c
b/drivers/staging/wlan-ng/hfa384x_usb.c
index fb32aaf13628..6261881e9bcd 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3611,8 +3611,7 @@ static void hfa384x_usbout_callback(struct urb *urb)
netdev_warn(hw->wlandev->netdev,
"%s tx pipe stalled: requesting reset\n",
wlandev->netdev->name);
- if (!test_and_set_bit
- (WORK_TX_HALT, &hw->usb_flags))
+ if (!test_and_set_bit(WORK_TX_HALT, &hw->usb_flags))
schedule_work(&hw->usb_work);
wlandev->netdev->stats.tx_errors++;
break;
@@ -3623,8 +3622,7 @@ static void hfa384x_usbout_callback(struct urb *urb)
case -EILSEQ: {
struct hfa384x *hw = wlandev->priv;
- if (!test_and_set_bit
- (THROTTLE_TX, &hw->usb_flags) &&
+ if (!test_and_set_bit(THROTTLE_TX, &hw->usb_flags) &&
!timer_pending(&hw->throttle)) {
mod_timer(&hw->throttle,
jiffies + THROTTLE_JIFFIES);
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index b720f564ecde..fb5441399131 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -341,9 +341,8 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev,
pr_debug("Received mlme ifstate request\n");
ifstatemsg = (struct p80211msg_lnxreq_ifstate *)msg;
- result =
- prism2sta_ifstate(wlandev,
- ifstatemsg->ifstate.data);
+ result = prism2sta_ifstate(wlandev,
+ ifstatemsg->ifstate.data);
ifstatemsg->resultcode.status =
P80211ENUM_msgitem_status_data_ok;
ifstatemsg->resultcode.data = result;
@@ -365,16 +364,12 @@ static int prism2sta_mlmerequest(struct wlandevice
*wlandev,
qualmsg = (struct p80211msg_lnxreq_commsquality *)msg;
- qualmsg->link.status =
- P80211ENUM_msgitem_status_data_ok;
- qualmsg->level.status =
- P80211ENUM_msgitem_status_data_ok;
- qualmsg->noise.status =
- P80211ENUM_msgitem_status_data_ok;
+ qualmsg->link.status = P80211ENUM_msgitem_status_data_ok;
+ qualmsg->level.status = P80211ENUM_msgitem_status_data_ok;
+ qualmsg->noise.status = P80211ENUM_msgitem_status_data_ok;
qualmsg->link.data = le16_to_cpu(hw->qual.cq_curr_bss);
- qualmsg->level.data =
- le16_to_cpu(hw->qual.asl_curr_bss);
+ qualmsg->level.data = le16_to_cpu(hw->qual.asl_curr_bss);
qualmsg->noise.data = le16_to_cpu(hw->qual.anl_curr_fc);
qualmsg->txrate.data = hw->txrate;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 09/12] staging: wlan-ng: make switch case block format consistent
For switch statements with case blocks make the format consistent by
applying K&R formatting, a space before the opening brace, single
indentation of contained code, break inside the block and closing
brace aligned with case.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x_usb.c | 48 +--
drivers/staging/wlan-ng/p80211req.c | 20 ++--
drivers/staging/wlan-ng/prism2mib.c | 38 +++---
drivers/staging/wlan-ng/prism2sta.c | 61 +--
4 files changed, 82 insertions(+), 85 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c
b/drivers/staging/wlan-ng/hfa384x_usb.c
index 16f7dd266e3b..fb32aaf13628 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3605,36 +3605,34 @@ static void hfa384x_usbout_callback(struct urb *urb)
prism2sta_ev_alloc(wlandev);
break;
- case -EPIPE:
- {
- struct hfa384x *hw = wlandev->priv;
+ case -EPIPE: {
+ struct hfa384x *hw = wlandev->priv;
- netdev_warn(hw->wlandev->netdev,
- "%s tx pipe stalled: requesting
reset\n",
- wlandev->netdev->name);
- if (!test_and_set_bit
- (WORK_TX_HALT, &hw->usb_flags))
- schedule_work(&hw->usb_work);
- wlandev->netdev->stats.tx_errors++;
- break;
- }
+ netdev_warn(hw->wlandev->netdev,
+ "%s tx pipe stalled: requesting reset\n",
+ wlandev->netdev->name);
+ if (!test_and_set_bit
+ (WORK_TX_HALT, &hw->usb_flags))
+ schedule_work(&hw->usb_work);
+ wlandev->netdev->stats.tx_errors++;
+ break;
+ }
case -EPROTO:
case -ETIMEDOUT:
- case -EILSEQ:
- {
- struct hfa384x *hw = wlandev->priv;
-
- if (!test_and_set_bit
- (THROTTLE_TX, &hw->usb_flags) &&
- !timer_pending(&hw->throttle)) {
- mod_timer(&hw->throttle,
- jiffies + THROTTLE_JIFFIES);
- }
- wlandev->netdev->stats.tx_errors++;
- netif_stop_queue(wlandev->netdev);
- break;
+ case -EILSEQ: {
+ struct hfa384x *hw = wlandev->priv;
+
+ if (!test_and_set_bit
+ (THROTTLE_TX, &hw->usb_flags) &&
+ !timer_pending(&hw->throttle)) {
+ mod_timer(&hw->throttle,
+ jiffies + THROTTLE_JIFFIES);
}
+ wlandev->netdev->stats.tx_errors++;
+ netif_stop_queue(wlandev->netdev);
+ break;
+ }
case -ENOENT:
case -ESHUTDOWN:
diff --git a/drivers/staging/wlan-ng/p80211req.c
b/drivers/staging/wlan-ng/p80211req.c
index d87076dbc556..e5f06471a25c 100644
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -172,7 +172,7 @@ static void p80211req_handlemsg(struct wlandevice *wlandev,
struct p80211msg *msg)
{
switch (msg->msgcode) {
- case DIDMSG_LNXREQ_HOSTWEP:{
+ case DIDMSG_LNXREQ_HOSTWEP: {
struct p80211msg_lnxreq_hostwep *req =
(struct p80211msg_lnxreq_hostwep *)msg;
wlandev->hostwep &=
@@ -182,15 +182,15 @@ static void p80211req_handlemsg(struct wlandevice
*wlandev,
if (req->encrypt.data == P80211ENUM_truth_true)
wlandev->hostwep |= HOSTWEP_ENCRYPT;
- break;
+ break;
}
case DIDMSG_DOT11REQ_MIBGET:
- case DIDMSG_DOT11REQ_MIBSET:{
+ case DIDMSG_DOT11REQ_MIBSET: {
int isget = (msg->msgcode == DIDMSG_DOT11REQ_MIBGET);
struct p80211msg_dot11req_mibget *mib_msg =
(struct p80211msg_dot11req_mibget *)msg;
p80211req_mibset_mi
[PATCH 12/12] staging: wlan-ng: remove "autogenerated code" comments
p80211metadef.h and p80211metastruct.h both have comments stating they are autogenerated and should not be edited. However, neither is generated during build and both have had numerous manual edits since the driver has been in staging. Signed-off-by: Tim Collier --- drivers/staging/wlan-ng/p80211metadef.h| 3 +-- drivers/staging/wlan-ng/p80211metastruct.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 95e79a32abfb..1b91b64c12ed 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ -/* This file is GENERATED AUTOMATICALLY. DO NOT EDIT OR MODIFY. - * +/* * * Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. * diff --git a/drivers/staging/wlan-ng/p80211metastruct.h b/drivers/staging/wlan-ng/p80211metastruct.h index 5602ec606074..4adc64580185 100644 --- a/drivers/staging/wlan-ng/p80211metastruct.h +++ b/drivers/staging/wlan-ng/p80211metastruct.h @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ -/* This file is GENERATED AUTOMATICALLY. DO NOT EDIT OR MODIFY. - * +/* * * Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. * -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 11/12] staging: wlan-ng: remove unnecessary braces from if
Remove braces from an if statement with only a single line in the if
block.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x_usb.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c
b/drivers/staging/wlan-ng/hfa384x_usb.c
index 6261881e9bcd..4824b37b27a3 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3623,10 +3623,9 @@ static void hfa384x_usbout_callback(struct urb *urb)
struct hfa384x *hw = wlandev->priv;
if (!test_and_set_bit(THROTTLE_TX, &hw->usb_flags) &&
- !timer_pending(&hw->throttle)) {
+ !timer_pending(&hw->throttle))
mod_timer(&hw->throttle,
jiffies + THROTTLE_JIFFIES);
- }
wlandev->netdev->stats.tx_errors++;
netif_stop_queue(wlandev->netdev);
break;
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 07/12] staging: wlan-ng: shorten names of "DIDMIB_P2_" macros
Shorten the names of the p80211metadef.h macros prefixed with
"DIDMIB_P2_" by removing repeat use of "P2" to reduce long lines and
ease readabbility.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/cfg80211.c | 2 +-
drivers/staging/wlan-ng/p80211metadef.h | 10 +-
drivers/staging/wlan-ng/prism2fw.c | 2 +-
drivers/staging/wlan-ng/prism2mib.c | 4 ++--
drivers/staging/wlan-ng/prism2sta.c | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wlan-ng/cfg80211.c
b/drivers/staging/wlan-ng/cfg80211.c
index 9ceb1727030d..a2f1136b97fa 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -129,7 +129,7 @@ static int prism2_change_virtual_intf(struct wiphy *wiphy,
/* Set Operation mode to the PORT TYPE RID */
result = prism2_domibset_uint32(wlandev,
- DIDMIB_P2_P2STATIC_P2CNFPORTTYPE,
+ DIDMIB_P2_STATIC_CNFPORTTYPE,
data);
if (result)
diff --git a/drivers/staging/wlan-ng/p80211metadef.h
b/drivers/staging/wlan-ng/p80211metadef.h
index ea0113765e40..95e79a32abfb 100644
--- a/drivers/staging/wlan-ng/p80211metadef.h
+++ b/drivers/staging/wlan-ng/p80211metadef.h
@@ -228,21 +228,21 @@
P80211DID_MKITEM(1) | 0x1800)
#define DIDMIB_CAT_P2 \
P80211DID_MKSECTION(5)
-#define DIDMIB_P2_P2STATIC \
+#define DIDMIB_P2_STATIC \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(2))
-#define DIDMIB_P2_P2STATIC_P2CNFPORTTYPE \
+#define DIDMIB_P2_STATIC_CNFPORTTYPE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(2) | \
P80211DID_MKITEM(1) | 0x1800)
-#define DIDMIB_P2_P2NIC_P2PRISUPRANGE \
+#define DIDMIB_P2_NIC_PRISUPRANGE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(5) | \
P80211DID_MKITEM(6) | 0x1000)
-#define DIDMIB_P2_P2MAC \
+#define DIDMIB_P2_MAC \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(6))
-#define DIDMIB_P2_P2MAC_P2CURRENTTXRATE \
+#define DIDMIB_P2_MAC_CURRENTTXRATE \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(12) | 0x1000)
diff --git a/drivers/staging/wlan-ng/prism2fw.c
b/drivers/staging/wlan-ng/prism2fw.c
index b13601cb02d3..f99626ca6bdc 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -304,7 +304,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr,
getmsg.resultcode.status = P80211ENUM_msgitem_status_no_value;
item = (struct p80211itemd *)getmsg.mibattribute.data;
- item->did = DIDMIB_P2_P2NIC_P2PRISUPRANGE;
+ item->did = DIDMIB_P2_NIC_PRISUPRANGE;
item->status = P80211ENUM_msgitem_status_no_value;
data = (u32 *)item->data;
diff --git a/drivers/staging/wlan-ng/prism2mib.c
b/drivers/staging/wlan-ng/prism2mib.c
index 427805eebd84..32a634478cc1 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -217,14 +217,14 @@ static struct mibrec mibtab[] = {
/* p2Static MIB's */
- {DIDMIB_P2_P2STATIC_P2CNFPORTTYPE,
+ {DIDMIB_P2_STATIC_CNFPORTTYPE,
F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFPORTTYPE, 0, 0,
prism2mib_uint32},
/* p2MAC MIB's */
- {DIDMIB_P2_P2MAC_P2CURRENTTXRATE,
+ {DIDMIB_P2_MAC_CURRENTTXRATE,
F_STA | F_READ,
HFA384x_RID_CURRENTTXRATE, 0, 0,
prism2mib_uint32},
diff --git a/drivers/staging/wlan-ng/prism2sta.c
b/drivers/staging/wlan-ng/prism2sta.c
index 537b49c1d6f1..83e80fbf9c6a 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -1950,7 +1950,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
/* Get the signal rate */
msg.msgcode = DIDMSG_DOT11REQ_MIBGET;
- mibitem->did = DIDMIB_P2_P2MAC_P2CURRENTTXRATE;
+ mibitem->did = DIDMIB_P2_MAC_CURRENTTXRATE;
result = p80211req_dorequest(wlandev, (u8 *)&msg);
if (result) {
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 11/12] staging: wlan-ng: remove unnecessary braces from if
On Wed, Aug 29, 2018 at 02:39:30PM +0300, Dan Carpenter wrote:
> On Tue, Aug 28, 2018 at 08:26:22PM +0100, Tim Collier wrote:
> > Remove braces from an if statement with only a single line in the if
> > block.
> >
> > Signed-off-by: Tim Collier
> > ---
> > drivers/staging/wlan-ng/hfa384x_usb.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c
> > b/drivers/staging/wlan-ng/hfa384x_usb.c
> > index 6261881e9bcd..4824b37b27a3 100644
> > --- a/drivers/staging/wlan-ng/hfa384x_usb.c
> > +++ b/drivers/staging/wlan-ng/hfa384x_usb.c
> > @@ -3623,10 +3623,9 @@ static void hfa384x_usbout_callback(struct urb *urb)
> > struct hfa384x *hw = wlandev->priv;
> >
> > if (!test_and_set_bit(THROTTLE_TX, &hw->usb_flags) &&
> > - !timer_pending(&hw->throttle)) {
> > + !timer_pending(&hw->throttle))
> > mod_timer(&hw->throttle,
> > jiffies + THROTTLE_JIFFIES);
> > - }
>
> This is fine either way. We sort of prefer the original style because
> it's more readable. Multi-line indents get curly braces.
Ok, I will drop this from v2. Thanks Dan.
>
> regards,
> dan carpenter
>
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 02/12] staging: wlan-ng: avoid use of camel case macro names in p80211metadef.h
On Wed, Aug 29, 2018 at 02:37:36PM +0300, Dan Carpenter wrote: > On Tue, Aug 28, 2018 at 08:26:13PM +0100, Tim Collier wrote: > > checkpatch reported a number of "Avoid CamelCase" issues for macros > > defined in p80211metadef.h (and for files that used these macros). > > > > Renamed the macros to all upper-case (except for > > DIDmib_dot11smt_dot11WEPDefaultKeysTable_key, a function-like macro, > > which was renamed to all lower-case) to conform to the coding > > guidelines. > > > > We rename variables and then rename them again to shorter names. It > feels like we should just do it one time... I split into two steps in case the shortening was rejected and also because the large number of changes for this particular patch seemed easier for review if the changes were simple and repetitive. Happy to change it, though. How would you recommend organizing? One patch per name changed, one per group or just one big hit including case change and shortenings? > > regards, > dan carpenter > Thanks, Tim Collier. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/2] staging: wlan-ng: fix line-break style issue
Fix checkpatch warning due to line break after '(', leaving an over 80
character warning due to long macro name.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x_usb.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c
b/drivers/staging/wlan-ng/hfa384x_usb.c
index a1b1d06d01bd..c1e88b8b751f 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3439,8 +3439,7 @@ static void hfa384x_usbin_rx(struct wlandevice *wlandev,
struct sk_buff *skb)
default:
netdev_warn(hw->wlandev->netdev, "Received frame on unsupported
port=%d\n",
- HFA384x_RXSTATUS_MACPORT_GET(
- usbin->rxfrm.desc.status));
+
HFA384x_RXSTATUS_MACPORT_GET(usbin->rxfrm.desc.status));
break;
}
}
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/2] staging: wlan-ng: add missing parameter name to prototype
Fix checkpatch warning for missing parameter name for function
prototype.
Signed-off-by: Tim Collier
---
drivers/staging/wlan-ng/hfa384x_usb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c
b/drivers/staging/wlan-ng/hfa384x_usb.c
index 555711bc12f0..a1b1d06d01bd 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -202,7 +202,7 @@ static void unlocked_usbctlx_complete(struct hfa384x *hw,
struct hfa384x_usbctlx *ctlx);
struct usbctlx_completor {
- int (*complete)(struct usbctlx_completor *);
+ int (*complete)(struct usbctlx_completor *completor);
};
static int
--
2.11.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
