staging:rtl8192u: Refactor union delba_param_set - Style

remove member 'charData' from the union delba_param_set, as it is not
used in code. The remaining member variables have all been renamed to
clear the checkpatch issue with CamelCase naming.

shortData  to short_data
Reserved   to reserved
Initiator  to initiator
TID        to tid

These changes are all coding style changes 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/rtl819x_BA.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
index 10e81c3c0ff15c8981e2a12ac0573c34e8feb8f6..008fe722af03e32a3957530347cad5fda60bc813 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
@@ -41,12 +41,11 @@ union ba_param_set {
 };
 
 union delba_param_set {
-       u8 charData[2];
-       u16 shortData;
+       u16 short_data;
        struct {
-               u16 Reserved:11;
-               u16 Initiator:1;
-               u16 TID:4;
+               u16 reserved:11;
+               u16 initiator:1;
+               u16 tid:4;
        } field;
 };
 

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
index 931123faf9ed90ccba85abc2e8b930dcad07ec96..e504d1eb2ccfd8154953be15b012abf287ba15e5 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -201,8 +201,8 @@ static struct sk_buff *ieee80211_DELBA(
 
        memset(&DelbaParamSet, 0, 2);
 
-       DelbaParamSet.field.Initiator   = (TxRxSelect == TX_DIR) ? 1 : 0;
-       DelbaParamSet.field.TID = pBA->BaParamSet.field.tid;
+       DelbaParamSet.field.initiator   = (TxRxSelect == TX_DIR) ? 1 : 0;
+       DelbaParamSet.field.tid = pBA->BaParamSet.field.tid;
 
        skb = dev_alloc_skb(len + sizeof(struct rtl_80211_hdr_3addr)); //need to add something others? FIXME
        if (!skb) {
@@ -226,7 +226,7 @@ static struct sk_buff *ieee80211_DELBA(
 
        // DELBA Parameter Set
 
-       put_unaligned_le16(DelbaParamSet.shortData, tag);
+       put_unaligned_le16(DelbaParamSet.short_data, tag);
        tag += 2;
        // Reason Code
 
@@ -565,14 +565,14 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
        dst = &delba->addr2[0];
        pDelBaParamSet = (union delba_param_set *)&delba->payload[2];
 
-       if (pDelBaParamSet->field.Initiator == 1) {
+       if (pDelBaParamSet->field.initiator == 1) {
                struct rx_ts_record *pRxTs;
 
                if (!GetTs(
                                ieee,
                                (struct ts_common_info **)&pRxTs,
                                dst,
-                               (u8)pDelBaParamSet->field.TID,
+                               (u8)pDelBaParamSet->field.tid,
                                RX_DIR,
                                false)) {
                        IEEE80211_DEBUG(IEEE80211_DL_ERR,  "can't get TS for RXTS in %s()\n", __func__);
@@ -587,7 +587,7 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
                        ieee,
                        (struct ts_common_info **)&pTxTs,
                        dst,
-                       (u8)pDelBaParamSet->field.TID,
+                       (u8)pDelBaParamSet->field.tid,
                        TX_DIR,
                        false)) {
                        IEEE80211_DEBUG(IEEE80211_DL_ERR,  "can't get TS for TXTS in %s()\n", __func__);