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

Commit 5cfa1b25 authored by Ana Rey's avatar Ana Rey Committed by Greg Kroah-Hartman
Browse files

staging: rtl8187se: fix coding style in function declarations 



Removed innecessary spaces and indentation errors in function definition
(including some curly braces wrongly placed and broke up at 80-chars per line).

I still see some errors if I run the checkpatch.pl script, but those are not
my fault. I'll address them in follow up patches.

Signed-off-by: default avatarAna Rey <anarey@gmail.com>
Acked-by: default avatarPablo Neira Ayuso <pablo@gnumonks.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ee86a38

drivers/staging/rtl8187se/ieee80211/dot11d.c

+8 −28
Original line number Diff line number Diff line 
#include "dot11d.h"



void

Dot11d_Init(struct ieee80211_device *ieee)

void Dot11d_Init(struct ieee80211_device *ieee)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);
@@ -17,8 +16,7 @@ Dot11d_Init(struct ieee80211_device *ieee) 
}



/* Reset to the state as we are just entering a regulatory domain. */

void

Dot11d_Reset(struct ieee80211_device *ieee)

void Dot11d_Reset(struct ieee80211_device *ieee)

{

	u32 i;

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(ieee);
@@ -50,13 +48,8 @@ Dot11d_Reset(struct ieee80211_device *ieee) 
 *	1. IS_DOT11D_ENABLE() is TRUE.

 *	2. Input IE is an valid one.

 */

void

Dot11d_UpdateCountryIe(

	struct ieee80211_device *dev,

	u8 *pTaddr,

	u16	CoutryIeLen,

	u8 *pCoutryIe

	)

void Dot11d_UpdateCountryIe(struct ieee80211_device *dev, u8 *pTaddr,

			    u16 CoutryIeLen, u8 *pCoutryIe)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);

	u8 i, j, NumTriples, MaxChnlNum;
@@ -122,11 +115,7 @@ Dot11d_UpdateCountryIe( 
	pDot11dInfo->State = DOT11D_STATE_LEARNED;

}



u8

DOT11D_GetMaxTxPwrInDbm(

	struct ieee80211_device *dev,

	u8 Channel

	)

u8 DOT11D_GetMaxTxPwrInDbm(struct ieee80211_device *dev, u8 Channel)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);

	u8 MaxTxPwrInDbm = 255;
@@ -142,10 +131,7 @@ DOT11D_GetMaxTxPwrInDbm( 
}





void

DOT11D_ScanComplete(

	struct ieee80211_device *dev

	)

void DOT11D_ScanComplete(struct ieee80211_device *dev)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);
@@ -165,10 +151,7 @@ DOT11D_ScanComplete( 
	}

}



int IsLegalChannel(

	struct ieee80211_device *dev,

	u8 channel

)

int IsLegalChannel(struct ieee80211_device *dev, u8 channel)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);
@@ -181,10 +164,7 @@ int IsLegalChannel( 
	return 0;

}



int ToLegalChannel(

	struct ieee80211_device *dev,

	u8 channel

)

int ToLegalChannel(struct ieee80211_device *dev, u8 channel)

{

	PRT_DOT11D_INFO pDot11dInfo = GET_DOT11D_INFO(dev);

	u8 default_chn = 0;

drivers/staging/rtl8187se/ieee80211/dot11d.h

+8 −38
Original line number Diff line number Diff line
@@ -58,43 +58,13 @@ typedef struct _RT_DOT11D_INFO { 


#define IS_DOT11D_STATE_DONE(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE)



void Dot11d_Init(struct ieee80211_device *dev);

void Dot11d_Reset(struct ieee80211_device *dev);

void Dot11d_UpdateCountryIe(struct ieee80211_device *dev, u8 *pTaddr,

			    u16 CoutryIeLen, u8 *pCoutryIe);

u8 DOT11D_GetMaxTxPwrInDbm(struct ieee80211_device *dev, u8 Channel);

void DOT11D_ScanComplete(struct ieee80211_device *dev);

int IsLegalChannel(struct ieee80211_device *dev, u8 channel);

int ToLegalChannel(struct ieee80211_device *dev, u8 channel);



void

Dot11d_Init(

	struct ieee80211_device *dev

	);



void

Dot11d_Reset(

	struct ieee80211_device *dev

	);



void

Dot11d_UpdateCountryIe(

	struct ieee80211_device *dev,

	u8 *		pTaddr,

	u16	CoutryIeLen,

	u8 * pCoutryIe

	);



u8

DOT11D_GetMaxTxPwrInDbm(

	struct ieee80211_device *dev,

	u8 Channel

	);



void

DOT11D_ScanComplete(

	struct ieee80211_device * dev

	);



int IsLegalChannel(

	struct ieee80211_device * dev,

	u8 channel

);



int ToLegalChannel(

	struct ieee80211_device * dev,

	u8 channel

);

#endif /*  #ifndef __INC_DOT11D_H */

drivers/staging/rtl8187se/ieee80211/ieee80211.h

+66 −56
Original line number Diff line number Diff line
@@ -1240,7 +1240,8 @@ static inline int ieee80211_is_empty_essid(const char *essid, int essid_len) 
	return 1;

}



static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)

static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee,

					  int mode)

{

	/*

	 * It is possible for both access points and our device to support
@@ -1303,13 +1304,10 @@ extern int ieee80211_set_encryption(struct ieee80211_device *ieee); 


/* ieee80211_tx.c */



extern int ieee80211_encrypt_fragment(

	struct ieee80211_device *ieee,

	struct sk_buff *frag,

	int hdr_len);

extern int ieee80211_encrypt_fragment(struct ieee80211_device *ieee,

				      struct sk_buff *frag, int hdr_len);



extern int ieee80211_rtl_xmit(struct sk_buff *skb,

			  struct net_device *dev);

extern int ieee80211_rtl_xmit(struct sk_buff *skb, struct net_device *dev);

extern void ieee80211_txb_free(struct ieee80211_txb *);
@@ -1344,12 +1342,15 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len); 
/* ieee80211_softmac.c */

extern short ieee80211_is_54g(const struct ieee80211_network *net);

extern short ieee80211_is_shortslot(const struct ieee80211_network *net);

extern int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,

			struct ieee80211_rx_stats *rx_stats, u16 type,

			u16 stype);

extern void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee80211_network *net);



extern void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *ieee);

extern int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee,

				      struct sk_buff *skb,

				      struct ieee80211_rx_stats *rx_stats,

				      u16 type, u16 stype);

extern void ieee80211_softmac_new_net(struct ieee80211_device *ieee,

				      struct ieee80211_network *net);



extern void ieee80211_softmac_xmit(struct ieee80211_txb *txb,

				   struct ieee80211_device *ieee);

extern void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee);

extern void ieee80211_start_bss(struct ieee80211_device *ieee);

extern void ieee80211_start_master_bss(struct ieee80211_device *ieee);
@@ -1371,15 +1372,16 @@ extern void ieee80211_rtl_stop_queue(struct ieee80211_device *ieee); 
extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee);

extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee);

extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee);

extern int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_point *p);

extern int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee,

					  struct iw_point *p);

extern void notify_wx_assoc_event(struct ieee80211_device *ieee);

extern void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success);

extern void SendDisassociation(struct ieee80211_device *ieee,u8* asSta,u8 asRsn);

extern void SendDisassociation(struct ieee80211_device *ieee, u8 *asSta,

			       u8 asRsn);

extern void ieee80211_rtl_start_scan(struct ieee80211_device *ieee);



//Add for RF power on power off by lizhaoming 080512

extern void SendDisassociation(struct ieee80211_device *ieee,

       			 u8*                     asSta,

extern void SendDisassociation(struct ieee80211_device *ieee, u8 *asSta,

			       u8 asRsn);



/* ieee80211_crypt_ccmp&tkip&wep.c */
@@ -1397,7 +1399,9 @@ extern int ieee80211_wx_set_wap(struct ieee80211_device *ieee, 
				union iwreq_data *awrq,

				char *extra);



extern int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b);

extern int ieee80211_wx_get_essid(struct ieee80211_device *ieee,

				  struct iw_request_info *a,

				  union iwreq_data *wrqu, char *b);



extern int ieee80211_wx_set_rate(struct ieee80211_device *ieee,

				 struct iw_request_info *info,
@@ -1407,23 +1411,28 @@ extern int ieee80211_wx_get_rate(struct ieee80211_device *ieee, 
				 struct iw_request_info *info,

				 union iwreq_data *wrqu, char *extra);



extern int ieee80211_wx_set_mode(struct ieee80211_device *ieee, struct iw_request_info *a,

extern int ieee80211_wx_set_mode(struct ieee80211_device *ieee,

				 struct iw_request_info *a,

				 union iwreq_data *wrqu, char *b);



extern int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info *a,

extern int ieee80211_wx_set_scan(struct ieee80211_device *ieee,

				 struct iw_request_info *a,

				 union iwreq_data *wrqu, char *b);



extern int ieee80211_wx_set_essid(struct ieee80211_device *ieee,

				  struct iw_request_info *a,

				  union iwreq_data *wrqu, char *extra);



extern int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a,

extern int ieee80211_wx_get_mode(struct ieee80211_device *ieee,

				 struct iw_request_info *a,

				 union iwreq_data *wrqu, char *b);



extern int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info *a,

extern int ieee80211_wx_set_freq(struct ieee80211_device *ieee,

				 struct iw_request_info *a,

				 union iwreq_data *wrqu, char *b);



extern int ieee80211_wx_get_freq(struct ieee80211_device *ieee, struct iw_request_info *a,

extern int ieee80211_wx_get_freq(struct ieee80211_device *ieee,

				 struct iw_request_info *a,

				 union iwreq_data *wrqu, char *b);



extern void ieee80211_wx_sync_scan_wq(struct work_struct *work);
@@ -1446,7 +1455,8 @@ extern int ieee80211_wx_get_power(struct ieee80211_device *ieee, 


extern void ieee80211_softmac_ips_scan_syncro(struct ieee80211_device *ieee);



extern void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee, short pwr);

extern void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee,

					     short pwr);



extern const long ieee80211_wlan_frequencies[];

drivers/staging/rtl8187se/ieee80211/ieee80211_crypt.c

+1 −2
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ struct ieee80211_crypto { 


static struct ieee80211_crypto *hcrypt;



void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee,

					   int force)

void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, int force)

{

	struct list_head *ptr, *n;

	struct ieee80211_crypt_data *entry;

drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c

+5 −4
Original line number Diff line number Diff line
@@ -520,7 +520,8 @@ static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr) 
}





static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv)

static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len,

				     void *priv)

{

	struct ieee80211_tkip_data *tkey = priv;

	u8 *pos;