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

diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index d4cf09b11e3324503e1323bf6eb07191b78926f1..c1cfbbbe5da3701b509e06b5915540664862e846 100644 (file)
--- 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 e63b4b557d0aa63c2ae5e64f75052b5425dc24e2..2a82f1d9b7f72910374e557c53c72ebde56e603f 100644 (file)
--- 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 c36d01469afc6d11187a9ab2adba771f81af4ed5..45c5a8eca33f899214fc1494037f1e39c6aa4d31 100644 (file)
--- 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 ddcaac648bd56e1a3a623186d8f21018fbf75d89..375e30f340417a46ef10912495410a32da62ac32 100644 (file)
--- 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 e88baf715cec33a43eea91cfd3af8f240d31579b..8cf6ead518ea3fa66e117e549e87dd7d9ca027d5 100644 (file)
--- 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 9149702496801adb8b3d36b1c89a7371d8208cbe..78a4875e0a731e952b4b2dd27d427fc55e17d2f6 100644 (file)
--- 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(wlandev, (u8 *)&msg);