lkml.org 
[lkml]   [2015]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/22] staging: rtl8192e: Make rtl8192_QueryIsShort() static
    Date
    Relocate function within file to avoid unnecessary fw decl.

    Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
    ---
    drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 24 ++++++++++++------------
    drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 1 -
    2 files changed, 12 insertions(+), 13 deletions(-)

    diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
    index f28676b..eb919b6 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
    +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
    @@ -1176,6 +1176,18 @@ static u8 rtl8192_MapHwQueueToFirmwareQueue(struct net_device *dev, u8 QueueID,
    return QueueSelect;
    }

    +static u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)
    +{
    + u8 tmp_Short;
    +
    + tmp_Short = (TxHT == 1) ? ((tcb_desc->bUseShortGI) ? 1 : 0) :
    + ((tcb_desc->bUseShortPreamble) ? 1 : 0);
    + if (TxHT == 1 && TxRate != DESC90_RATEMCS15)
    + tmp_Short = 0;
    +
    + return tmp_Short;
    +}
    +
    void rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc,
    struct cb_desc *cb_desc, struct sk_buff *skb)
    {
    @@ -2380,18 +2392,6 @@ bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device *dev)
    return Reval;
    }

    -u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)
    -{
    - u8 tmp_Short;
    -
    - tmp_Short = (TxHT == 1) ? ((tcb_desc->bUseShortGI) ? 1 : 0) :
    - ((tcb_desc->bUseShortPreamble) ? 1 : 0);
    - if (TxHT == 1 && TxRate != DESC90_RATEMCS15)
    - tmp_Short = 0;
    -
    - return tmp_Short;
    -}
    -
    void ActUpdateChannelAccessSetting(struct net_device *dev,
    enum wireless_mode WirelessMode,
    struct channel_access_setting *ChnlAccessSetting)
    diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
    index dbe0e1c..4f1b312 100644
    --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
    +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
    @@ -27,7 +27,6 @@

    #include "r8190P_def.h"

    -u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc);
    bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device *dev);
    bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev);
    bool rtl8192_HalTxCheckStuck(struct net_device *dev);
    --
    1.8.4.1


    \
     
     \ /
      Last update: 2015-07-12 22:41    [W:2.157 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site