Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01b67faf authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Make rtl8192_QueryIsShort() static 



Relocate function within file to avoid unnecessary fw decl.

Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc5a1591

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+12 −12
Original line number Diff line number Diff line
@@ -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)

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h

+0 −1
Original line number Diff line number Diff line
@@ -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);