Commit 0593758e authored by Javier M. Mellid's avatar Javier M. Mellid Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: fixed coding style issues 



Fixed some style and format issues with headers.

Signed-off-by: default avatarJavier M. Mellid <jmunhoz@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 790c3093

drivers/staging/rtl8712/ieee80211.h

+14 −12
Original line number Diff line number Diff line
@@ -754,15 +754,17 @@ struct registry_priv; 
u8 *r8712_set_ie(u8 *pbuf, sint index, uint len, u8 *source, uint *frlen);

u8 *r8712_get_ie(u8*pbuf, sint index, sint *len, sint limit);

unsigned char *r8712_get_wpa_ie(unsigned char *pie, int *rsn_ie_len, int limit);

unsigned char *r8712_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len, int limit);

unsigned char *r8712_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len,

				 int limit);

int r8712_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher,

			int *pairwise_cipher);

int r8712_parse_wpa2_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher,

			int *pairwise_cipher);

int r8712_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie,

	       u16 *wpa_len);

int r8712_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len,

		     u8 *wpa_ie, u16 *wpa_len);

int r8712_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen);

int r8712_generate_ie(struct registry_priv *pregistrypriv, struct _adapter *padapter);

int r8712_generate_ie(struct registry_priv *pregistrypriv,

		      struct _adapter *padapter);

uint r8712_is_cckrates_included(u8 *rate);

uint r8712_is_cckratesonly_included(u8 *rate);

drivers/staging/rtl8712/osdep_service.h

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ static inline u32 is_list_empty(struct list_head *phead) 
		return false;

}



static inline void list_insert_tail(struct list_head *plist, struct list_head *phead)

static inline void list_insert_tail(struct list_head *plist,

				    struct list_head *phead)

{

	list_add_tail(plist, phead);

}

drivers/staging/rtl8712/recv_osdep.h

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ s32 r8712_recv_entry(union recv_frame *precv_frame); 
void r8712_recv_indicatepkt(struct _adapter *adapter,

			    union recv_frame *precv_frame);

void r8712_handle_tkip_mic_err(struct _adapter *padapter, u8 bgroup);

int r8712_init_recv_priv(struct recv_priv *precvpriv, struct _adapter *padapter);

int r8712_init_recv_priv(struct recv_priv *precvpriv,

			 struct _adapter *padapter);

void r8712_free_recv_priv(struct recv_priv *precvpriv);

int r8712_os_recv_resource_alloc(struct _adapter *padapter,

				 union recv_frame *precvframe);
@@ -24,4 +25,3 @@ void r8712_os_read_port(struct _adapter *padapter, struct recv_buf *precvbuf); 
void r8712_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl);



#endif

drivers/staging/rtl8712/rtl8712_event.h

+13 −12
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ static struct fwevent wlanevents[] = { 
	{0, NULL},

	{0, NULL},

	{0, &r8712_survey_event_callback},		/*8*/

	{sizeof(struct surveydone_event), &r8712_surveydone_event_callback},/*9*/

	{sizeof(struct surveydone_event),

		&r8712_surveydone_event_callback},	/*9*/



	{0, &r8712_joinbss_event_callback},		/*10*/

	{sizeof(struct stassoc_event), &r8712_stassoc_event_callback},

drivers/staging/rtl8712/rtl8712_xmit.h

+1 −10
Original line number Diff line number Diff line
@@ -60,24 +60,15 @@ 
#define DISFB BIT(15)



struct tx_desc {



	/*DWORD 0*/

	unsigned int txdw0;



	unsigned int txdw1;



	unsigned int txdw2;



	unsigned int txdw3;



	unsigned int txdw4;



	unsigned int txdw5;



	unsigned int txdw6;



	unsigned int txdw7;



};