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 <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 8bc7a4c..6edc28c 100644 (file)
--- 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, "0000000000000");
 
        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 a74af59..2515c22 100644 (file)
--- 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) | 0x0c000000)
 #define DIDmib_dot11smt_dot11PrivacyTable \

diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index cab5775..7df3480 100644 (file)
--- 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 8cf6ead..ebd9921 100644 (file)
--- 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_dot11smt_wepdefaultkeystable_key(4),
         F_STA | F_WRITE,
         HFA384x_RID_CNFWEPDEFAULTKEY3, 0, 0,
         prism2mib_wepdefaultkey},