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

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 <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 9af2aaf01e142fdf6d88790e67af9572be1fc80f..9602ef0b5ae150a25d899d49f8f0a7b1e359e01a 100644 (file)
--- 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 dae733524342a8df8629a4d4e94c1ec8cee6ec54..d8dcc94d6f2c8e1d0b2112ea1dfae29f70eb0229 100644 (file)
--- 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) | 0x10000000)

diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index 33331e0d061bbc6de9e49618cc076255d37fb250..a8da03ced62e72a011a2b808656bd1e5478721f0 100644 (file)
--- 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},