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 <osdevtc@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h
index d42b91dce4b003c76e45221d24411dd6b814819c..95e79a32abfb13c89947bf18fa0397a0e05cc89c 100644 (file)
--- 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) | 0x10000000)

diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index 32d1515904d4fb1e53245d2e6c73ec6126b69a71..32a634478cc176c8eab754ff6139648561bcafa2 100644 (file)
--- 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 99266581511fb9bfed16b6c1d62dc77f93cfe871..83e80fbf9c6a59d02dd9e68b54a66f348fa634d9 100644 (file)
--- 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) {