diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-02 14:10:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-03 06:18:23 -0400 |
| commit | ba2d3587912f82d1ab4367975b1df460db60fb1e (patch) | |
| tree | 1e4e04caf23274bb4e39edbfc5713b4856326953 /drivers/net/wireless/prism54 | |
| parent | 1273d97674a1782ff55b823aa6c40aea9b538aaf (diff) | |
drivers/net: use __packed annotation
cleanup patch.
Use new __packed annotation in drivers/net/
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/prism54')
| -rw-r--r-- | drivers/net/wireless/prism54/isl_ioctl.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/prism54/isl_oid.h | 18 | ||||
| -rw-r--r-- | drivers/net/wireless/prism54/islpci_eth.h | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/prism54/islpci_mgt.h | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index 8d1190c0f062..13730a807002 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c | |||
| @@ -2101,7 +2101,7 @@ struct ieee80211_beacon_phdr { | |||
| 2101 | u8 timestamp[8]; | 2101 | u8 timestamp[8]; |
| 2102 | u16 beacon_int; | 2102 | u16 beacon_int; |
| 2103 | u16 capab_info; | 2103 | u16 capab_info; |
| 2104 | } __attribute__ ((packed)); | 2104 | } __packed; |
| 2105 | 2105 | ||
| 2106 | #define WLAN_EID_GENERIC 0xdd | 2106 | #define WLAN_EID_GENERIC 0xdd |
| 2107 | static u8 wpa_oid[4] = { 0x00, 0x50, 0xf2, 1 }; | 2107 | static u8 wpa_oid[4] = { 0x00, 0x50, 0xf2, 1 }; |
diff --git a/drivers/net/wireless/prism54/isl_oid.h b/drivers/net/wireless/prism54/isl_oid.h index b7534c2869c8..59e31258d450 100644 --- a/drivers/net/wireless/prism54/isl_oid.h +++ b/drivers/net/wireless/prism54/isl_oid.h | |||
| @@ -29,20 +29,20 @@ | |||
| 29 | struct obj_ssid { | 29 | struct obj_ssid { |
| 30 | u8 length; | 30 | u8 length; |
| 31 | char octets[33]; | 31 | char octets[33]; |
| 32 | } __attribute__ ((packed)); | 32 | } __packed; |
| 33 | 33 | ||
| 34 | struct obj_key { | 34 | struct obj_key { |
| 35 | u8 type; /* dot11_priv_t */ | 35 | u8 type; /* dot11_priv_t */ |
| 36 | u8 length; | 36 | u8 length; |
| 37 | char key[32]; | 37 | char key[32]; |
| 38 | } __attribute__ ((packed)); | 38 | } __packed; |
| 39 | 39 | ||
| 40 | struct obj_mlme { | 40 | struct obj_mlme { |
| 41 | u8 address[6]; | 41 | u8 address[6]; |
| 42 | u16 id; | 42 | u16 id; |
| 43 | u16 state; | 43 | u16 state; |
| 44 | u16 code; | 44 | u16 code; |
| 45 | } __attribute__ ((packed)); | 45 | } __packed; |
| 46 | 46 | ||
| 47 | struct obj_mlmeex { | 47 | struct obj_mlmeex { |
| 48 | u8 address[6]; | 48 | u8 address[6]; |
| @@ -51,12 +51,12 @@ struct obj_mlmeex { | |||
| 51 | u16 code; | 51 | u16 code; |
| 52 | u16 size; | 52 | u16 size; |
| 53 | u8 data[0]; | 53 | u8 data[0]; |
| 54 | } __attribute__ ((packed)); | 54 | } __packed; |
| 55 | 55 | ||
| 56 | struct obj_buffer { | 56 | struct obj_buffer { |
| 57 | u32 size; | 57 | u32 size; |
| 58 | u32 addr; /* 32bit bus address */ | 58 | u32 addr; /* 32bit bus address */ |
| 59 | } __attribute__ ((packed)); | 59 | } __packed; |
| 60 | 60 | ||
| 61 | struct obj_bss { | 61 | struct obj_bss { |
| 62 | u8 address[6]; | 62 | u8 address[6]; |
| @@ -77,17 +77,17 @@ struct obj_bss { | |||
| 77 | short rates; | 77 | short rates; |
| 78 | short basic_rates; | 78 | short basic_rates; |
| 79 | int:16; /* padding */ | 79 | int:16; /* padding */ |
| 80 | } __attribute__ ((packed)); | 80 | } __packed; |
| 81 | 81 | ||
| 82 | struct obj_bsslist { | 82 | struct obj_bsslist { |
| 83 | u32 nr; | 83 | u32 nr; |
| 84 | struct obj_bss bsslist[0]; | 84 | struct obj_bss bsslist[0]; |
| 85 | } __attribute__ ((packed)); | 85 | } __packed; |
| 86 | 86 | ||
| 87 | struct obj_frequencies { | 87 | struct obj_frequencies { |
| 88 | u16 nr; | 88 | u16 nr; |
| 89 | u16 mhz[0]; | 89 | u16 mhz[0]; |
| 90 | } __attribute__ ((packed)); | 90 | } __packed; |
| 91 | 91 | ||
| 92 | struct obj_attachment { | 92 | struct obj_attachment { |
| 93 | char type; | 93 | char type; |
| @@ -95,7 +95,7 @@ struct obj_attachment { | |||
| 95 | short id; | 95 | short id; |
| 96 | short size; | 96 | short size; |
| 97 | char data[0]; | 97 | char data[0]; |
| 98 | } __attribute__((packed)); | 98 | } __packed; |
| 99 | 99 | ||
| 100 | /* | 100 | /* |
| 101 | * in case everything's ok, the inlined function below will be | 101 | * in case everything's ok, the inlined function below will be |
diff --git a/drivers/net/wireless/prism54/islpci_eth.h b/drivers/net/wireless/prism54/islpci_eth.h index 54f9a4b7bf9b..6ca30a5b7bfb 100644 --- a/drivers/net/wireless/prism54/islpci_eth.h +++ b/drivers/net/wireless/prism54/islpci_eth.h | |||
| @@ -34,13 +34,13 @@ struct rfmon_header { | |||
| 34 | __le16 unk3; | 34 | __le16 unk3; |
| 35 | u8 rssi; | 35 | u8 rssi; |
| 36 | u8 padding[3]; | 36 | u8 padding[3]; |
| 37 | } __attribute__ ((packed)); | 37 | } __packed; |
| 38 | 38 | ||
| 39 | struct rx_annex_header { | 39 | struct rx_annex_header { |
| 40 | u8 addr1[ETH_ALEN]; | 40 | u8 addr1[ETH_ALEN]; |
| 41 | u8 addr2[ETH_ALEN]; | 41 | u8 addr2[ETH_ALEN]; |
| 42 | struct rfmon_header rfmon; | 42 | struct rfmon_header rfmon; |
| 43 | } __attribute__ ((packed)); | 43 | } __packed; |
| 44 | 44 | ||
| 45 | /* wlan-ng (and hopefully others) AVS header, version one. Fields in | 45 | /* wlan-ng (and hopefully others) AVS header, version one. Fields in |
| 46 | * network byte order. */ | 46 | * network byte order. */ |
diff --git a/drivers/net/wireless/prism54/islpci_mgt.h b/drivers/net/wireless/prism54/islpci_mgt.h index 0b27e50fe0d5..0db93db9b675 100644 --- a/drivers/net/wireless/prism54/islpci_mgt.h +++ b/drivers/net/wireless/prism54/islpci_mgt.h | |||
| @@ -101,7 +101,7 @@ typedef struct { | |||
| 101 | u8 device_id; | 101 | u8 device_id; |
| 102 | u8 flags; | 102 | u8 flags; |
| 103 | u32 length; | 103 | u32 length; |
| 104 | } __attribute__ ((packed)) | 104 | } __packed |
| 105 | pimfor_header_t; | 105 | pimfor_header_t; |
| 106 | 106 | ||
| 107 | /* A received and interrupt-processed management frame, either for | 107 | /* A received and interrupt-processed management frame, either for |
