diff options
Diffstat (limited to 'drivers/net/wireless/orinoco/main.c')
-rw-r--r-- | drivers/net/wireless/orinoco/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c index ca71f08709bc..e8e2d0f4763d 100644 --- a/drivers/net/wireless/orinoco/main.c +++ b/drivers/net/wireless/orinoco/main.c | |||
@@ -172,7 +172,7 @@ struct hermes_txexc_data { | |||
172 | __le16 frame_ctl; | 172 | __le16 frame_ctl; |
173 | __le16 duration_id; | 173 | __le16 duration_id; |
174 | u8 addr1[ETH_ALEN]; | 174 | u8 addr1[ETH_ALEN]; |
175 | } __attribute__ ((packed)); | 175 | } __packed; |
176 | 176 | ||
177 | /* Rx frame header except compatibility 802.3 header */ | 177 | /* Rx frame header except compatibility 802.3 header */ |
178 | struct hermes_rx_descriptor { | 178 | struct hermes_rx_descriptor { |
@@ -196,7 +196,7 @@ struct hermes_rx_descriptor { | |||
196 | 196 | ||
197 | /* Data length */ | 197 | /* Data length */ |
198 | __le16 data_len; | 198 | __le16 data_len; |
199 | } __attribute__ ((packed)); | 199 | } __packed; |
200 | 200 | ||
201 | struct orinoco_rx_data { | 201 | struct orinoco_rx_data { |
202 | struct hermes_rx_descriptor *desc; | 202 | struct hermes_rx_descriptor *desc; |
@@ -390,7 +390,7 @@ int orinoco_process_xmit_skb(struct sk_buff *skb, | |||
390 | struct header_struct { | 390 | struct header_struct { |
391 | struct ethhdr eth; /* 802.3 header */ | 391 | struct ethhdr eth; /* 802.3 header */ |
392 | u8 encap[6]; /* 802.2 header */ | 392 | u8 encap[6]; /* 802.2 header */ |
393 | } __attribute__ ((packed)) hdr; | 393 | } __packed hdr; |
394 | int len = skb->len + sizeof(encaps_hdr) - (2 * ETH_ALEN); | 394 | int len = skb->len + sizeof(encaps_hdr) - (2 * ETH_ALEN); |
395 | 395 | ||
396 | if (skb_headroom(skb) < ENCAPS_OVERHEAD) { | 396 | if (skb_headroom(skb) < ENCAPS_OVERHEAD) { |
@@ -1170,7 +1170,7 @@ static void orinoco_join_ap(struct work_struct *work) | |||
1170 | struct join_req { | 1170 | struct join_req { |
1171 | u8 bssid[ETH_ALEN]; | 1171 | u8 bssid[ETH_ALEN]; |
1172 | __le16 channel; | 1172 | __le16 channel; |
1173 | } __attribute__ ((packed)) req; | 1173 | } __packed req; |
1174 | const int atom_len = offsetof(struct prism2_scan_apinfo, atim); | 1174 | const int atom_len = offsetof(struct prism2_scan_apinfo, atim); |
1175 | struct prism2_scan_apinfo *atom = NULL; | 1175 | struct prism2_scan_apinfo *atom = NULL; |
1176 | int offset = 4; | 1176 | int offset = 4; |
@@ -1410,7 +1410,7 @@ void __orinoco_ev_info(struct net_device *dev, hermes_t *hw) | |||
1410 | struct { | 1410 | struct { |
1411 | __le16 len; | 1411 | __le16 len; |
1412 | __le16 type; | 1412 | __le16 type; |
1413 | } __attribute__ ((packed)) info; | 1413 | } __packed info; |
1414 | int len, type; | 1414 | int len, type; |
1415 | int err; | 1415 | int err; |
1416 | 1416 | ||