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

Commit 93df38e5 authored by Edgardo Hames's avatar Edgardo Hames Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: fix style issues for p80211hdr.h 



Removed typedef and other style issues.

Signed-off-by: default avatarEdgardo Hames <ehames@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6487c49e

drivers/staging/wlan-ng/hfa384x.h

+1 −1
Original line number Diff line number Diff line
@@ -1409,7 +1409,7 @@ int hfa384x_drvr_start(hfa384x_t *hw); 
int hfa384x_drvr_stop(hfa384x_t *hw);

int

hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb,

		     p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep);

		     union p80211_hdr *p80211_hdr, p80211_metawep_t *p80211_wep);

void hfa384x_tx_timeout(wlandevice_t *wlandev);



int hfa384x_cmd_initialize(hfa384x_t *hw);

drivers/staging/wlan-ng/hfa384x_usb.c

+2 −2
Original line number Diff line number Diff line
@@ -2706,7 +2706,7 @@ int hfa384x_drvr_stop(hfa384x_t *hw) 
*	interrupt

----------------------------------------------------------------*/

int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb,

			 p80211_hdr_t *p80211_hdr,

			 union p80211_hdr *p80211_hdr,

			 p80211_metawep_t *p80211_wep)

{

	int usbpktlen = sizeof(hfa384x_tx_frame_t);
@@ -2752,7 +2752,7 @@ int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, 


	/* copy the header over to the txdesc */

	memcpy(&(hw->txbuff.txfrm.desc.frame_control), p80211_hdr,

	       sizeof(p80211_hdr_t));

	       sizeof(union p80211_hdr));



	/* if we're using host WEP, increase size by IV+ICV */

	if (p80211_wep->data) {

drivers/staging/wlan-ng/p80211conv.c

+3 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static u8 oui_8021h[] = { 0x00, 0x00, 0xf8 }; 
*	May be called in interrupt or non-interrupt context

----------------------------------------------------------------*/

int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,

			struct sk_buff *skb, p80211_hdr_t *p80211_hdr,

			struct sk_buff *skb, union p80211_hdr *p80211_hdr,

			p80211_metawep_t *p80211_wep)

{
@@ -280,7 +280,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, 
	unsigned int payload_offset;

	u8 daddr[WLAN_ETHADDR_LEN];

	u8 saddr[WLAN_ETHADDR_LEN];

	p80211_hdr_t *w_hdr;

	union p80211_hdr *w_hdr;

	wlan_ethhdr_t *e_hdr;

	wlan_llc_t *e_llc;

	wlan_snap_t *e_snap;
@@ -290,7 +290,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, 
	payload_length = skb->len - WLAN_HDR_A3_LEN - WLAN_CRC_LEN;

	payload_offset = WLAN_HDR_A3_LEN;



	w_hdr = (p80211_hdr_t *) skb->data;

	w_hdr = (union p80211_hdr *) skb->data;



	/* setup some vars for convenience */

	fc = le16_to_cpu(w_hdr->a3.fc);

drivers/staging/wlan-ng/p80211conv.h

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ struct wlandevice; 
int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv,

			struct sk_buff *skb);

int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv,

			struct sk_buff *skb, p80211_hdr_t *p80211_hdr,

			struct sk_buff *skb, union p80211_hdr *p80211_hdr,

			p80211_metawep_t *p80211_wep);



int p80211_stt_findproto(u16 proto);

drivers/staging/wlan-ng/p80211hdr.h

+12 −12
Original line number Diff line number Diff line
@@ -147,16 +147,16 @@ 


/* Generic 802.11 Header types */



typedef struct p80211_hdr_a3 {

struct p80211_hdr_a3 {

	u16 fc;

	u16 dur;

	u8 a1[ETH_ALEN];

	u8 a2[ETH_ALEN];

	u8 a3[ETH_ALEN];

	u16 seq;

} __attribute__ ((packed)) p80211_hdr_a3_t;

} __attribute__ ((packed));



typedef struct p80211_hdr_a4 {

struct p80211_hdr_a4 {

	u16 fc;

	u16 dur;

	u8 a1[ETH_ALEN];
@@ -164,12 +164,12 @@ typedef struct p80211_hdr_a4 { 
	u8 a3[ETH_ALEN];

	u16 seq;

	u8 a4[ETH_ALEN];

} __attribute__ ((packed)) p80211_hdr_a4_t;

} __attribute__ ((packed));



typedef union p80211_hdr {

	p80211_hdr_a3_t a3;

	p80211_hdr_a4_t a4;

} __attribute__ ((packed)) p80211_hdr_t;

union p80211_hdr {

	struct p80211_hdr_a3 a3;

	struct p80211_hdr_a4 a4;

} __attribute__ ((packed));



/* Frame and header length macros */