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

Commit 099c5bb1 authored by Jiri Benc's avatar Jiri Benc Committed by Jeff Garzik
Browse files

ieee80211: use endian-aware types 



From: Michael Wu <flamingice@sourmilk.net>

This patch:
- fixes misc. whitespace/comments
- replaces u16 with __le16/__be16 where appropriate

Signed-off-by: default avatarMichael Wu <flamingice@sourmilk.net>
Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
parent 95d5185d

include/net/ieee80211.h

+22 −24
Original line number Diff line number Diff line
@@ -47,22 +47,22 @@ 
#define IEEE80211_FRAME_LEN		(IEEE80211_DATA_LEN + IEEE80211_HLEN)



struct ieee80211_hdr {

	u16 frame_ctl;

	u16 duration_id;

	__le16 frame_ctl;

	__le16 duration_id;

	u8 addr1[ETH_ALEN];

	u8 addr2[ETH_ALEN];

	u8 addr3[ETH_ALEN];

	u16 seq_ctl;

	__le16 seq_ctl;

	u8 addr4[ETH_ALEN];

} __attribute__ ((packed));



struct ieee80211_hdr_3addr {

	u16 frame_ctl;

	u16 duration_id;

	__le16 frame_ctl;

	__le16 duration_id;

	u8 addr1[ETH_ALEN];

	u8 addr2[ETH_ALEN];

	u8 addr3[ETH_ALEN];

	u16 seq_ctl;

	__le16 seq_ctl;

} __attribute__ ((packed));



enum eap_type {
@@ -88,10 +88,10 @@ static inline const char *eap_get_type(int type) 


struct eapol {

	u8 snap[6];

	u16 ethertype;

	__be16 ethertype;

	u8 version;

	u8 type;

	u16 length;

	__be16 length;

} __attribute__ ((packed));



#define IEEE80211_1ADDR_LEN 10
@@ -235,9 +235,9 @@ const char *escape_essid(const char *essid, u8 essid_len); 
#include <linux/if_arp.h> /* ARPHRD_ETHER */



#ifndef WIRELESS_SPY

#define WIRELESS_SPY		// enable iwspy support

#define WIRELESS_SPY		/* enable iwspy support */

#endif

#include <net/iw_handler.h>	// new driver API

#include <net/iw_handler.h>	/* new driver API */



#ifndef ETH_P_PAE

#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
@@ -588,9 +588,9 @@ struct ieee80211_info_element { 


struct ieee80211_authentication {

	struct ieee80211_hdr_3addr header;

	u16 algorithm;

	u16 transaction;

	u16 status;

	__le16 algorithm;

	__le16 transaction;

	__le16 status;

	struct ieee80211_info_element info_element;

} __attribute__ ((packed));
@@ -598,23 +598,23 @@ struct ieee80211_authentication { 
struct ieee80211_probe_response {

	struct ieee80211_hdr_3addr header;

	u32 time_stamp[2];

	u16 beacon_interval;

	u16 capability;

	__le16 beacon_interval;

	__le16 capability;

	struct ieee80211_info_element info_element;

} __attribute__ ((packed));



struct ieee80211_assoc_request_frame {

	u16 capability;

	u16 listen_interval;

	__le16 capability;

	__le16 listen_interval;

	u8 current_ap[ETH_ALEN];

	struct ieee80211_info_element info_element;

} __attribute__ ((packed));



struct ieee80211_assoc_response_frame {

	struct ieee80211_hdr_3addr header;

	u16 capability;

	u16 status;

	u16 aid;

	__le16 capability;

	__le16 status;

	__le16 aid;

	struct ieee80211_info_element info_element; /* supported rates */

} __attribute__ ((packed));
@@ -857,8 +857,6 @@ extern struct net_device *alloc_ieee80211(int sizeof_priv); 
extern int ieee80211_set_encryption(struct ieee80211_device *ieee);



/* ieee80211_tx.c */





extern int ieee80211_xmit(struct sk_buff *skb,

			  struct net_device *dev);

extern void ieee80211_txb_free(struct ieee80211_txb *);
@@ -871,7 +869,7 @@ extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, 
			     struct ieee80211_hdr *header,

			     struct ieee80211_rx_stats *stats);



/* iee80211_wx.c */

/* ieee80211_wx.c */

extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee,

				 struct iw_request_info *info,

				 union iwreq_data *wrqu, char *key);