lkml.org 
[lkml]   [2018]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/17] staging:rtl8192u: Refactor BA_PARAM_SET - Style
    Date
    Refactor the union BA_PARAM_SET, firstly removing the 'typedef', this
    clears the checkpatch issue with defining new types. Secondly the union
    is renamed to lowercase to comply with the coding standard.

    These are coding style changes which should have no impact on runtime
    code execution.

    Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
    ---
    drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | 6 +++---
    drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 8 ++++----
    2 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
    index 6bbabd9e6562..44f820404347 100644
    --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
    +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
    @@ -30,7 +30,7 @@ union sequence_control {
    } field;
    };

    -typedef union _BA_PARAM_SET {
    +union ba_param_set {
    u8 charData[2];
    u16 shortData;
    struct {
    @@ -39,7 +39,7 @@ typedef union _BA_PARAM_SET {
    u16 TID:4;
    u16 BufferSize:10;
    } field;
    -} BA_PARAM_SET, *PBA_PARAM_SET;
    +};

    typedef union _DELBA_PARAM_SET {
    u8 charData[2];
    @@ -55,7 +55,7 @@ typedef struct _BA_RECORD {
    struct timer_list Timer;
    u8 bValid;
    u8 DialogToken;
    - BA_PARAM_SET BaParamSet;
    + union ba_param_set BaParamSet;
    u16 BaTimeoutValue;
    union sequence_control BaStartSeqCtrl;
    } BA_RECORD, *PBA_RECORD;
    diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
    index 643fd891f476..469e3e9a0d2e 100644
    --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
    +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
    @@ -322,7 +322,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
    u16 rc = 0;
    u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL;
    PBA_RECORD pBA = NULL;
    - PBA_PARAM_SET pBaParamSet = NULL;
    + union ba_param_set *pBaParamSet = NULL;
    u16 *pBaTimeoutVal = NULL;
    union sequence_control *pBaStartSeqCtrl = NULL;
    struct rx_ts_record *pTS = NULL;
    @@ -342,7 +342,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb)
    dst = &req->addr2[0];
    tag += sizeof(struct rtl_80211_hdr_3addr);
    pDialogToken = tag + 2; //category+action
    - pBaParamSet = (PBA_PARAM_SET)(tag + 3); //+DialogToken
    + pBaParamSet = (union ba_param_set *)(tag + 3); //+DialogToken
    pBaTimeoutVal = (u16 *)(tag + 5);
    pBaStartSeqCtrl = (union sequence_control *)(req + 7);

    @@ -423,7 +423,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
    struct tx_ts_record *pTS = NULL;
    u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL;
    u16 *pStatusCode = NULL, *pBaTimeoutVal = NULL;
    - PBA_PARAM_SET pBaParamSet = NULL;
    + union ba_param_set *pBaParamSet = NULL;
    u16 ReasonCode;

    if (skb->len < sizeof(struct rtl_80211_hdr_3addr) + 9) {
    @@ -439,7 +439,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
    tag += sizeof(struct rtl_80211_hdr_3addr);
    pDialogToken = tag + 2;
    pStatusCode = (u16 *)(tag + 3);
    - pBaParamSet = (PBA_PARAM_SET)(tag + 5);
    + pBaParamSet = (union ba_param_set *)(tag + 5);
    pBaTimeoutVal = (u16 *)(tag + 7);

    // Check the capability
    --
    2.18.0
    \
     
     \ /
      Last update: 2018-08-21 19:21    [W:2.782 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site