提交 cdcfc210 编写于 作者: J James Ketrenos 提交者: Jeff Garzik

[PATCH] ieee80211: Additional fixes for endian-aware types

tree 589bbb92ce7cdf7c2ae820b0ebd3f8fbf1baeee9
parent c6ce9081e79e8836a11e86e3d38297521a2420be
author Jiri Benc <jbenc@suse.cz> 1125015310 -0400
committer James Ketrenos <jketreno@linux.intel.com> 1127313914 -0500

Additional fixes for endian-aware types

Based on the application of __le16/__be16 changes already made w/ a
prior patch by Michael Wu <flamingice@sourmilk.net>
Signed-off-by: NJames Ketrenos <jketreno@linux.intel.com>
Signed-off-by: NJeff Garzik <jgarzik@pobox.com>
上级 3905ec45
...@@ -503,68 +503,68 @@ enum ieee80211_mfie { ...@@ -503,68 +503,68 @@ enum ieee80211_mfie {
* information to determine what type of underlying data type is actually * information to determine what type of underlying data type is actually
* stored in the data. */ * stored in the data. */
struct ieee80211_hdr { struct ieee80211_hdr {
u16 frame_ctl; __le16 frame_ctl;
u16 duration_id; __le16 duration_id;
u8 payload[0]; u8 payload[0];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ieee80211_hdr_1addr { struct ieee80211_hdr_1addr {
u16 frame_ctl; __le16 frame_ctl;
u16 duration_id; __le16 duration_id;
u8 addr1[ETH_ALEN]; u8 addr1[ETH_ALEN];
u8 payload[0]; u8 payload[0];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ieee80211_hdr_2addr { struct ieee80211_hdr_2addr {
u16 frame_ctl; __le16 frame_ctl;
u16 duration_id; __le16 duration_id;
u8 addr1[ETH_ALEN]; u8 addr1[ETH_ALEN];
u8 addr2[ETH_ALEN]; u8 addr2[ETH_ALEN];
u8 payload[0]; u8 payload[0];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ieee80211_hdr_3addr { struct ieee80211_hdr_3addr {
u16 frame_ctl; __le16 frame_ctl;
u16 duration_id; __le16 duration_id;
u8 addr1[ETH_ALEN]; u8 addr1[ETH_ALEN];
u8 addr2[ETH_ALEN]; u8 addr2[ETH_ALEN];
u8 addr3[ETH_ALEN]; u8 addr3[ETH_ALEN];
u16 seq_ctl; __le16 seq_ctl;
u8 payload[0]; u8 payload[0];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ieee80211_hdr_4addr { struct ieee80211_hdr_4addr {
u16 frame_ctl; __le16 frame_ctl;
u16 duration_id; __le16 duration_id;
u8 addr1[ETH_ALEN]; u8 addr1[ETH_ALEN];
u8 addr2[ETH_ALEN]; u8 addr2[ETH_ALEN];
u8 addr3[ETH_ALEN]; u8 addr3[ETH_ALEN];
u16 seq_ctl; __le16 seq_ctl;
u8 addr4[ETH_ALEN]; u8 addr4[ETH_ALEN];
u8 payload[0]; u8 payload[0];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ieee80211_hdr_3addrqos { struct ieee80211_hdr_3addrqos {
u16 frame_ctl; __le16 frame_ctl;
u16 duration_id; __le16 duration_id;
u8 addr1[ETH_ALEN]; u8 addr1[ETH_ALEN];
u8 addr2[ETH_ALEN]; u8 addr2[ETH_ALEN];
u8 addr3[ETH_ALEN]; u8 addr3[ETH_ALEN];
u16 seq_ctl; __le16 seq_ctl;
u8 payload[0]; u8 payload[0];
u16 qos_ctl; __le16 qos_ctl;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ieee80211_hdr_4addrqos { struct ieee80211_hdr_4addrqos {
u16 frame_ctl; __le16 frame_ctl;
u16 duration_id; __le16 duration_id;
u8 addr1[ETH_ALEN]; u8 addr1[ETH_ALEN];
u8 addr2[ETH_ALEN]; u8 addr2[ETH_ALEN];
u8 addr3[ETH_ALEN]; u8 addr3[ETH_ALEN];
u16 seq_ctl; __le16 seq_ctl;
u8 addr4[ETH_ALEN]; u8 addr4[ETH_ALEN];
u8 payload[0]; u8 payload[0];
u16 qos_ctl; __le16 qos_ctl;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ieee80211_info_element { struct ieee80211_info_element {
...@@ -600,7 +600,7 @@ struct ieee80211_auth { ...@@ -600,7 +600,7 @@ struct ieee80211_auth {
struct ieee80211_disassoc { struct ieee80211_disassoc {
struct ieee80211_hdr_3addr header; struct ieee80211_hdr_3addr header;
u16 reason_code; __le16 reason_code;
struct ieee80211_info_element info_element[0]; struct ieee80211_info_element info_element[0];
} __attribute__ ((packed)); } __attribute__ ((packed));
...@@ -622,8 +622,8 @@ struct ieee80211_probe_response { ...@@ -622,8 +622,8 @@ struct ieee80211_probe_response {
struct ieee80211_assoc_request { struct ieee80211_assoc_request {
struct ieee80211_hdr_3addr header; struct ieee80211_hdr_3addr header;
u16 capability; __le16 capability;
u16 listen_interval; __le16 listen_interval;
struct ieee80211_info_element info_element[0]; struct ieee80211_info_element info_element[0];
} __attribute__ ((packed)); } __attribute__ ((packed));
...@@ -648,8 +648,8 @@ struct ieee80211_txb { ...@@ -648,8 +648,8 @@ struct ieee80211_txb {
u8 encrypted; u8 encrypted;
u8 rts_included; u8 rts_included;
u8 reserved; u8 reserved;
u16 frag_size; __le16 frag_size;
u16 payload_size; __le16 payload_size;
struct sk_buff *fragments[0]; struct sk_buff *fragments[0];
}; };
...@@ -699,7 +699,7 @@ struct ieee80211_qos_information_element { ...@@ -699,7 +699,7 @@ struct ieee80211_qos_information_element {
struct ieee80211_qos_ac_parameter { struct ieee80211_qos_ac_parameter {
u8 aci_aifsn; u8 aci_aifsn;
u8 ecw_min_max; u8 ecw_min_max;
u16 tx_op_limit; __le16 tx_op_limit;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ieee80211_qos_parameter_info { struct ieee80211_qos_parameter_info {
...@@ -709,11 +709,11 @@ struct ieee80211_qos_parameter_info { ...@@ -709,11 +709,11 @@ struct ieee80211_qos_parameter_info {
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ieee80211_qos_parameters { struct ieee80211_qos_parameters {
u16 cw_min[QOS_QUEUE_NUM]; __le16 cw_min[QOS_QUEUE_NUM];
u16 cw_max[QOS_QUEUE_NUM]; __le16 cw_max[QOS_QUEUE_NUM];
u8 aifs[QOS_QUEUE_NUM]; u8 aifs[QOS_QUEUE_NUM];
u8 flag[QOS_QUEUE_NUM]; u8 flag[QOS_QUEUE_NUM];
u16 tx_op_limit[QOS_QUEUE_NUM]; __le16 tx_op_limit[QOS_QUEUE_NUM];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ieee80211_qos_data { struct ieee80211_qos_data {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册