staging:rtl8192u: Rename octet_string members - Style

Rename the structure octet_string's member variables Octet to octet and
Length to length. This change clears the checkpatch issue with CamelCase
naming of variables.

This is purely a coding style change which should have no impact on
runtime code execution.

Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index 706b441..51cb5e4 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -1066,49 +1066,49 @@ ieee80211_association_req(struct ieee80211_network *beacon,
                struct octet_string     osCcxAironetIE;
 
                memset(CcxAironetBuf, 0, 30);
-               osCcxAironetIE.Octet = CcxAironetBuf;
-               osCcxAironetIE.Length = sizeof(CcxAironetBuf);
+               osCcxAironetIE.octet = CcxAironetBuf;
+               osCcxAironetIE.length = sizeof(CcxAironetBuf);
                //
                // Ref. CCX test plan v3.61, 3.2.3.1 step 13.
                // We want to make the device type as "4500-client". 060926, by CCW.
                //
-               memcpy(osCcxAironetIE.Octet, AironetIeOui, sizeof(AironetIeOui));
+               memcpy(osCcxAironetIE.octet, AironetIeOui, sizeof(AironetIeOui));
 
                // CCX1 spec V1.13, A01.1 CKIP Negotiation (page23):
                // "The CKIP negotiation is started with the associate request from the client to the access point,
                //  containing an Aironet element with both the MIC and KP bits set."
-               osCcxAironetIE.Octet[IE_CISCO_FLAG_POSITION] |= (SUPPORT_CKIP_PK | SUPPORT_CKIP_MIC);
+               osCcxAironetIE.octet[IE_CISCO_FLAG_POSITION] |= (SUPPORT_CKIP_PK | SUPPORT_CKIP_MIC);
                tag = skb_put(skb, ckip_ie_len);
                *tag++ = MFIE_TYPE_AIRONET;
-               *tag++ = osCcxAironetIE.Length;
-               memcpy(tag, osCcxAironetIE.Octet, osCcxAironetIE.Length);
-               tag += osCcxAironetIE.Length;
+               *tag++ = osCcxAironetIE.length;
+               memcpy(tag, osCcxAironetIE.octet, osCcxAironetIE.length);
+               tag += osCcxAironetIE.length;
        }
 
        if (beacon->bCcxRmEnable) {
                static u8 CcxRmCapBuf[] = {0x00, 0x40, 0x96, 0x01, 0x01, 0x00};
                struct octet_string osCcxRmCap;
 
-               osCcxRmCap.Octet = CcxRmCapBuf;
-               osCcxRmCap.Length = sizeof(CcxRmCapBuf);
+               osCcxRmCap.octet = CcxRmCapBuf;
+               osCcxRmCap.length = sizeof(CcxRmCapBuf);
                tag = skb_put(skb, ccxrm_ie_len);
                *tag++ = MFIE_TYPE_GENERIC;
-               *tag++ = osCcxRmCap.Length;
-               memcpy(tag, osCcxRmCap.Octet, osCcxRmCap.Length);
-               tag += osCcxRmCap.Length;
+               *tag++ = osCcxRmCap.length;
+               memcpy(tag, osCcxRmCap.octet, osCcxRmCap.length);
+               tag += osCcxRmCap.length;
        }
 
        if (beacon->BssCcxVerNumber >= 2) {
                u8                      CcxVerNumBuf[] = {0x00, 0x40, 0x96, 0x03, 0x00};
                struct octet_string     osCcxVerNum;
                CcxVerNumBuf[4] = beacon->BssCcxVerNumber;
-               osCcxVerNum.Octet = CcxVerNumBuf;
-               osCcxVerNum.Length = sizeof(CcxVerNumBuf);
+               osCcxVerNum.octet = CcxVerNumBuf;
+               osCcxVerNum.length = sizeof(CcxVerNumBuf);
                tag = skb_put(skb, cxvernum_ie_len);
                *tag++ = MFIE_TYPE_GENERIC;
-               *tag++ = osCcxVerNum.Length;
-               memcpy(tag, osCcxVerNum.Octet, osCcxVerNum.Length);
-               tag += osCcxVerNum.Length;
+               *tag++ = osCcxVerNum.length;
+               memcpy(tag, osCcxVerNum.octet, osCcxVerNum.length);
+               tag += osCcxVerNum.length;
        }
        //HT cap element
        if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) {

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
index 264d15f..b948eae 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
@@ -738,10 +738,10 @@ void HTConstructRT2RTAggElement(struct ieee80211_device *ieee, u8 *posRT2RTAgg,
           section of code.
        if(IS_UNDER_11N_AES_MODE(Adapter))
        {
-               posRT2RTAgg->Octet[5] |= RT_HT_CAP_USE_AMPDU;
+               posRT2RTAgg->octet[5] |= RT_HT_CAP_USE_AMPDU;
        }else
        {
-               posRT2RTAgg->Octet[5] &= 0xfb;
+               posRT2RTAgg->octet[5] &= 0xfb;
        }
        */
 #else

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 531a3e2..50b05ee 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -73,8 +73,8 @@ struct tspec_body {
 //      802.11 Management frame Status Code field
 //----------------------------------------------------------------------------
 struct octet_string {
-       u8              *Octet;
-       u16             Length;
+       u8              *octet;
+       u16             length;
 };
 
 //Added by joseph