staging: wlan-ng: rename DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID in...

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 <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 e27daf2b700de3b2d13006f1d02e5588befffe9a..11f59a70f4a0b3fe26b4ae48f01ef0a34ba589c1 100644 (file)
--- 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 3dfa1da983e87da4df98a986e6edea4decec2884..c21c0cc9c993339a37cad7bf9644b525a8e3261e 100644 (file)
--- 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) | 0x18000000)
-#define DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID \
+#define DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID \
                        (P80211DID_MKSECTION(1) | \
                        P80211DID_MKGROUP(6) | \
                        P80211DID_MKITEM(2) | 0x18000000)

diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index 7fcee85c288180efbedc0a7d7e26c12891733b05..eb14b56791f21f2c3931fdfaea713ba9c4179bf4 100644 (file)
--- 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 831f315084bc45fe5f6c81564eccbd3285c15ab9..3d22fe723887647e373e75308f171364d9dd8e88 100644 (file)
--- 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},