Commit 54586533 authored by Larry Finger's avatar Larry Finger
Browse files

staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part VIII 



Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 922d71a4

drivers/staging/rtl8192e/rtl_core.c

+1180 −1169

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8192e/rtl_core.h

+382 −359
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include <linux/if_arp.h>

#include <linux/random.h>

#include <linux/version.h>

#include <asm/io.h>

#include <linux/io.h>

#include "rtllib.h"



#include "dot11d.h"
@@ -62,19 +62,26 @@ 
#include "rtl_pci.h"

#include "rtl_cam.h"



#define DRV_COPYRIGHT  "Copyright(c) 2008 - 2010 Realsil Semiconductor Corporation"

#define DRV_COPYRIGHT		\

	"Copyright(c) 2008 - 2010 Realsil Semiconductor Corporation"

#define DRV_AUTHOR  "<wlanfae@realtek.com>"

#define DRV_VERSION  "0014.0401.2010"



#define DRV_NAME "rtl819xE"



#define IS_HARDWARE_TYPE_819xP(_priv) ((((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8190P)||\

#define IS_HARDWARE_TYPE_819xP(_priv)		\

	((((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8190P) || \

	(((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192E))

#define IS_HARDWARE_TYPE_8192SE(_priv)	(((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8192SE)

#define IS_HARDWARE_TYPE_8192CE(_priv)	(((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8192CE)

#define IS_HARDWARE_TYPE_8192CU(_priv)	(((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8192CU)

#define IS_HARDWARE_TYPE_8192DE(_priv)	(((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8192DE)

#define IS_HARDWARE_TYPE_8192DU(_priv)	(((struct r8192_priv *)rtllib_priv(dev))->card_8192==NIC_8192DU)

#define IS_HARDWARE_TYPE_8192SE(_priv)		\

	(((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192SE)

#define IS_HARDWARE_TYPE_8192CE(_priv)		\

	(((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192CE)

#define IS_HARDWARE_TYPE_8192CU(_priv)		\

	(((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192CU)

#define IS_HARDWARE_TYPE_8192DE(_priv)		\

	(((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192DE)

#define IS_HARDWARE_TYPE_8192DU(_priv)		\

	(((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192DU)



#define RTL_PCI_DEVICE(vend, dev, cfg) \

	.vendor = (vend), .device = (dev), \
@@ -100,7 +107,8 @@ 


#define IS_ADAPTER_SENDS_BEACON(dev) 0



#define IS_UNDER_11N_AES_MODE(_rtllib)  ((_rtllib->pHTInfo->bCurrentHTSupport == true) &&\

#define IS_UNDER_11N_AES_MODE(_rtllib)		\

	((_rtllib->pHTInfo->bCurrentHTSupport == true) && \

	(_rtllib->pairwise_key_type == KEY_TYPE_CCMP))



#define HAL_MEMORY_MAPPED_IO_RANGE_8190PCI	0x1000
@@ -149,7 +157,9 @@ 
#define MAX_802_11_HEADER_LENGTH	(40 + MAX_FIRMWARE_INFORMATION_SIZE)

#define ENCRYPTION_MAX_OVERHEAD		128

#define MAX_FRAGMENT_COUNT		8

#define MAX_TRANSMIT_BUFFER_SIZE	(1600+(MAX_802_11_HEADER_LENGTH+ENCRYPTION_MAX_OVERHEAD)*MAX_FRAGMENT_COUNT)

#define MAX_TRANSMIT_BUFFER_SIZE	\

	(1600 + (MAX_802_11_HEADER_LENGTH + ENCRYPTION_MAX_OVERHEAD) *	\

	 MAX_FRAGMENT_COUNT)



#define scrclng				4
@@ -164,7 +174,7 @@ 


#define	PHY_RSSI_SLID_WIN_MAX			100



#define RTL_IOCTL_WPA_SUPPLICANT		SIOCIWFIRSTPRIV+30

#define RTL_IOCTL_WPA_SUPPLICANT		(SIOCIWFIRSTPRIV + 30)



#define TxBBGainTableLength			37

#define CCKTxBBGainTableLength			23
@@ -527,10 +537,21 @@ struct rtl819x_ops{ 
	void (*init_before_adapter_start)(struct net_device *dev);

	bool (*initialize_adapter)(struct net_device *dev);

	void (*link_change)(struct net_device *dev);

	void (* tx_fill_descriptor)(struct net_device* dev, struct tx_desc *tx_desc, struct cb_desc *cb_desc, struct sk_buff *skb);

	void (* tx_fill_cmd_descriptor)(struct net_device* dev, struct tx_desc_cmd * entry, struct cb_desc *cb_desc, struct sk_buff *skb);

	bool (* rx_query_status_descriptor)(struct net_device* dev, struct rtllib_rx_stats*  stats, struct rx_desc *pdesc, struct sk_buff* skb);

	bool (* rx_command_packet_handler)(struct net_device *dev, struct sk_buff* skb, struct rx_desc *pdesc);

	void (*tx_fill_descriptor)(struct net_device *dev,

				   struct tx_desc *tx_desc,

				   struct cb_desc *cb_desc,

				   struct sk_buff *skb);

	void (*tx_fill_cmd_descriptor)(struct net_device *dev,

				       struct tx_desc_cmd *entry,

				       struct cb_desc *cb_desc,

				       struct sk_buff *skb);

	bool (*rx_query_status_descriptor)(struct net_device *dev,

					   struct rtllib_rx_stats *stats,

					   struct rx_desc *pdesc,

					   struct sk_buff *skb);

	bool (*rx_command_packet_handler)(struct net_device *dev,

					  struct sk_buff *skb,

					  struct rx_desc *pdesc);

	void (*stop_adapter)(struct net_device *dev, bool reset);

	void (*update_ratr_table)(struct net_device *dev);

	void (*irq_enable)(struct net_device *dev);
@@ -538,7 +559,8 @@ struct rtl819x_ops{ 
	void (*irq_clear)(struct net_device *dev);

	void (*rx_enable)(struct net_device *dev);

	void (*tx_enable)(struct net_device *dev);

	void (* interrupt_recognized)(struct net_device *dev, u32 *p_inta, u32 *p_intb);

	void (*interrupt_recognized)(struct net_device *dev,

				     u32 *p_inta, u32 *p_intb);

	bool (*TxCheckStuckHandler)(struct net_device *dev);

	bool (*RxCheckStuckHandler)(struct net_device *dev);

};
@@ -672,7 +694,10 @@ struct r8192_priv { 


	/**********************************************************/



	enum card_type {PCI,MINIPCI,CARDBUS,USB}card_type;

	enum card_type {

		PCI, MINIPCI,

		CARDBUS, USB

	} card_type;



	struct work_struct qos_activate;
@@ -727,7 +752,6 @@ struct r8192_priv { 
	u32 last_rxdesc_tsf_high;

	u32 last_rxdesc_tsf_low;





	u16 basic_rate;

	u8 short_preamble;

	u8 dot11CurrentPreambleMode;
@@ -1038,7 +1062,8 @@ void rtl8192_rx_enable(struct net_device *); 
void rtl8192_tx_enable(struct net_device *);



int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev);

void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rate);

void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,

			    int rate);

void rtl8192_data_hard_stop(struct net_device *dev);

void rtl8192_data_hard_resume(struct net_device *dev);

void rtl8192_restart(void *data);
@@ -1074,29 +1099,27 @@ void rtl8192_config_rate(struct net_device* dev, u16* rate_config); 
void rtl8192_update_cap(struct net_device *dev, u16 cap);

void rtl8192_irq_disable(struct net_device *dev);



void rtl819x_UpdateRxPktTimeStamp (struct net_device *dev, struct rtllib_rx_stats *stats);

void rtl819x_UpdateRxPktTimeStamp(struct net_device *dev,

				  struct rtllib_rx_stats *stats);

long rtl819x_translate_todbm(struct r8192_priv *priv, u8 signal_strength_index);

void rtl819x_update_rxsignalstatistics8190pci(struct r8192_priv * priv,struct rtllib_rx_stats * pprevious_stats);

void rtl819x_update_rxsignalstatistics8190pci(struct r8192_priv *priv,

				      struct rtllib_rx_stats *pprevious_stats);

u8 rtl819x_evm_dbtopercentage(char value);

void rtl819x_process_cck_rxpathsel(struct r8192_priv * priv,struct rtllib_rx_stats * pprevious_stats);

void rtl819x_process_cck_rxpathsel(struct r8192_priv *priv,

				   struct rtllib_rx_stats *pprevious_stats);

u8 rtl819x_query_rxpwrpercentage(char antpower);

void rtl8192_record_rxdesc_forlateruse(struct rtllib_rx_stats * psrc_stats,struct rtllib_rx_stats * ptarget_stats);

void rtl8192_record_rxdesc_forlateruse(struct rtllib_rx_stats *psrc_stats,

				       struct rtllib_rx_stats *ptarget_stats);



bool NicIFEnableNIC(struct net_device *dev);

bool NicIFDisableNIC(struct net_device *dev);



bool

MgntActSet_RF_State(

	struct net_device* dev,

bool MgntActSet_RF_State(struct net_device *dev,

			 enum rt_rf_power_state StateToSet,

			 RT_RF_CHANGE_SOURCE ChangeSource,

	bool	ProtectOrNot

	);

void

ActUpdateChannelAccessSetting(

	struct net_device*			dev,

			 bool	ProtectOrNot);

void ActUpdateChannelAccessSetting(struct net_device *dev,

			   enum wireless_mode WirelessMode,

	struct channel_access_setting *ChnlAccessSetting

	);

			   struct channel_access_setting *ChnlAccessSetting);



#endif