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/usb | |
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/usb')
-rw-r--r-- | drivers/net/usb/asix.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/hso.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/kaweth.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/net1080.c | 4 | ||||
-rw-r--r-- | drivers/net/usb/sierra_net.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 1f802e90474c..7e797ed0439a 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c | |||
@@ -179,7 +179,7 @@ struct ax88172_int_data { | |||
179 | __le16 res2; | 179 | __le16 res2; |
180 | u8 status; | 180 | u8 status; |
181 | __le16 res3; | 181 | __le16 res3; |
182 | } __attribute__ ((packed)); | 182 | } __packed; |
183 | 183 | ||
184 | static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, | 184 | static int asix_read_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index, |
185 | u16 size, void *data) | 185 | u16 size, void *data) |
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 0a3c41faea9c..c8570b097880 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c | |||
@@ -211,7 +211,7 @@ struct hso_serial_state_notification { | |||
211 | u16 wIndex; | 211 | u16 wIndex; |
212 | u16 wLength; | 212 | u16 wLength; |
213 | u16 UART_state_bitmap; | 213 | u16 UART_state_bitmap; |
214 | } __attribute__((packed)); | 214 | } __packed; |
215 | 215 | ||
216 | struct hso_tiocmget { | 216 | struct hso_tiocmget { |
217 | struct mutex mutex; | 217 | struct mutex mutex; |
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index d6078b8c4273..2b7b39cad1ce 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c | |||
@@ -207,7 +207,7 @@ struct kaweth_ethernet_configuration | |||
207 | __le16 segment_size; | 207 | __le16 segment_size; |
208 | __u16 max_multicast_filters; | 208 | __u16 max_multicast_filters; |
209 | __u8 reserved3; | 209 | __u8 reserved3; |
210 | } __attribute__ ((packed)); | 210 | } __packed; |
211 | 211 | ||
212 | /**************************************************************** | 212 | /**************************************************************** |
213 | * kaweth_device | 213 | * kaweth_device |
diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c index 961a8ed38d8f..ba72a7281cb0 100644 --- a/drivers/net/usb/net1080.c +++ b/drivers/net/usb/net1080.c | |||
@@ -64,13 +64,13 @@ struct nc_header { // packed: | |||
64 | // all else is optional, and must start with: | 64 | // all else is optional, and must start with: |
65 | // __le16 vendorId; // from usb-if | 65 | // __le16 vendorId; // from usb-if |
66 | // __le16 productId; | 66 | // __le16 productId; |
67 | } __attribute__((__packed__)); | 67 | } __packed; |
68 | 68 | ||
69 | #define PAD_BYTE ((unsigned char)0xAC) | 69 | #define PAD_BYTE ((unsigned char)0xAC) |
70 | 70 | ||
71 | struct nc_trailer { | 71 | struct nc_trailer { |
72 | __le16 packet_id; | 72 | __le16 packet_id; |
73 | } __attribute__((__packed__)); | 73 | } __packed; |
74 | 74 | ||
75 | // packets may use FLAG_FRAMING_NC and optional pad | 75 | // packets may use FLAG_FRAMING_NC and optional pad |
76 | #define FRAMED_SIZE(mtu) (sizeof (struct nc_header) \ | 76 | #define FRAMED_SIZE(mtu) (sizeof (struct nc_header) \ |
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c index f1942d69a0d5..ee85c8b9a858 100644 --- a/drivers/net/usb/sierra_net.c +++ b/drivers/net/usb/sierra_net.c | |||
@@ -165,7 +165,7 @@ struct lsi_umts { | |||
165 | u8 gw_addr_len; /* NW-supplied GW address len */ | 165 | u8 gw_addr_len; /* NW-supplied GW address len */ |
166 | u8 gw_addr[16]; /* NW-supplied GW address (bigendian) */ | 166 | u8 gw_addr[16]; /* NW-supplied GW address (bigendian) */ |
167 | u8 reserved[8]; | 167 | u8 reserved[8]; |
168 | } __attribute__ ((packed)); | 168 | } __packed; |
169 | 169 | ||
170 | #define SIERRA_NET_LSI_COMMON_LEN 4 | 170 | #define SIERRA_NET_LSI_COMMON_LEN 4 |
171 | #define SIERRA_NET_LSI_UMTS_LEN (sizeof(struct lsi_umts)) | 171 | #define SIERRA_NET_LSI_UMTS_LEN (sizeof(struct lsi_umts)) |