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/qlge/qlge.h | |
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/qlge/qlge.h')
-rw-r--r-- | drivers/net/qlge/qlge.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h index 20624ba44a37..bfb8b327f2fd 100644 --- a/drivers/net/qlge/qlge.h +++ b/drivers/net/qlge/qlge.h | |||
@@ -1062,7 +1062,7 @@ struct tx_buf_desc { | |||
1062 | #define TX_DESC_LEN_MASK 0x000fffff | 1062 | #define TX_DESC_LEN_MASK 0x000fffff |
1063 | #define TX_DESC_C 0x40000000 | 1063 | #define TX_DESC_C 0x40000000 |
1064 | #define TX_DESC_E 0x80000000 | 1064 | #define TX_DESC_E 0x80000000 |
1065 | } __attribute((packed)); | 1065 | } __packed; |
1066 | 1066 | ||
1067 | /* | 1067 | /* |
1068 | * IOCB Definitions... | 1068 | * IOCB Definitions... |
@@ -1095,7 +1095,7 @@ struct ob_mac_iocb_req { | |||
1095 | __le16 vlan_tci; | 1095 | __le16 vlan_tci; |
1096 | __le16 reserved4; | 1096 | __le16 reserved4; |
1097 | struct tx_buf_desc tbd[TX_DESC_PER_IOCB]; | 1097 | struct tx_buf_desc tbd[TX_DESC_PER_IOCB]; |
1098 | } __attribute((packed)); | 1098 | } __packed; |
1099 | 1099 | ||
1100 | struct ob_mac_iocb_rsp { | 1100 | struct ob_mac_iocb_rsp { |
1101 | u8 opcode; /* */ | 1101 | u8 opcode; /* */ |
@@ -1112,7 +1112,7 @@ struct ob_mac_iocb_rsp { | |||
1112 | u32 tid; | 1112 | u32 tid; |
1113 | u32 txq_idx; | 1113 | u32 txq_idx; |
1114 | __le32 reserved[13]; | 1114 | __le32 reserved[13]; |
1115 | } __attribute((packed)); | 1115 | } __packed; |
1116 | 1116 | ||
1117 | struct ob_mac_tso_iocb_req { | 1117 | struct ob_mac_tso_iocb_req { |
1118 | u8 opcode; | 1118 | u8 opcode; |
@@ -1140,7 +1140,7 @@ struct ob_mac_tso_iocb_req { | |||
1140 | __le16 vlan_tci; | 1140 | __le16 vlan_tci; |
1141 | __le16 mss; | 1141 | __le16 mss; |
1142 | struct tx_buf_desc tbd[TX_DESC_PER_IOCB]; | 1142 | struct tx_buf_desc tbd[TX_DESC_PER_IOCB]; |
1143 | } __attribute((packed)); | 1143 | } __packed; |
1144 | 1144 | ||
1145 | struct ob_mac_tso_iocb_rsp { | 1145 | struct ob_mac_tso_iocb_rsp { |
1146 | u8 opcode; | 1146 | u8 opcode; |
@@ -1157,7 +1157,7 @@ struct ob_mac_tso_iocb_rsp { | |||
1157 | u32 tid; | 1157 | u32 tid; |
1158 | u32 txq_idx; | 1158 | u32 txq_idx; |
1159 | __le32 reserved2[13]; | 1159 | __le32 reserved2[13]; |
1160 | } __attribute((packed)); | 1160 | } __packed; |
1161 | 1161 | ||
1162 | struct ib_mac_iocb_rsp { | 1162 | struct ib_mac_iocb_rsp { |
1163 | u8 opcode; /* 0x20 */ | 1163 | u8 opcode; /* 0x20 */ |
@@ -1216,7 +1216,7 @@ struct ib_mac_iocb_rsp { | |||
1216 | #define IB_MAC_IOCB_RSP_HL 0x80 | 1216 | #define IB_MAC_IOCB_RSP_HL 0x80 |
1217 | __le32 hdr_len; /* */ | 1217 | __le32 hdr_len; /* */ |
1218 | __le64 hdr_addr; /* */ | 1218 | __le64 hdr_addr; /* */ |
1219 | } __attribute((packed)); | 1219 | } __packed; |
1220 | 1220 | ||
1221 | struct ib_ae_iocb_rsp { | 1221 | struct ib_ae_iocb_rsp { |
1222 | u8 opcode; | 1222 | u8 opcode; |
@@ -1237,7 +1237,7 @@ struct ib_ae_iocb_rsp { | |||
1237 | #define PCI_ERR_ANON_BUF_RD 0x40 | 1237 | #define PCI_ERR_ANON_BUF_RD 0x40 |
1238 | u8 q_id; | 1238 | u8 q_id; |
1239 | __le32 reserved[15]; | 1239 | __le32 reserved[15]; |
1240 | } __attribute((packed)); | 1240 | } __packed; |
1241 | 1241 | ||
1242 | /* | 1242 | /* |
1243 | * These three structures are for generic | 1243 | * These three structures are for generic |
@@ -1249,7 +1249,7 @@ struct ql_net_rsp_iocb { | |||
1249 | __le16 length; | 1249 | __le16 length; |
1250 | __le32 tid; | 1250 | __le32 tid; |
1251 | __le32 reserved[14]; | 1251 | __le32 reserved[14]; |
1252 | } __attribute((packed)); | 1252 | } __packed; |
1253 | 1253 | ||
1254 | struct net_req_iocb { | 1254 | struct net_req_iocb { |
1255 | u8 opcode; | 1255 | u8 opcode; |
@@ -1257,7 +1257,7 @@ struct net_req_iocb { | |||
1257 | __le16 flags1; | 1257 | __le16 flags1; |
1258 | __le32 tid; | 1258 | __le32 tid; |
1259 | __le32 reserved1[30]; | 1259 | __le32 reserved1[30]; |
1260 | } __attribute((packed)); | 1260 | } __packed; |
1261 | 1261 | ||
1262 | /* | 1262 | /* |
1263 | * tx ring initialization control block for chip. | 1263 | * tx ring initialization control block for chip. |
@@ -1283,7 +1283,7 @@ struct wqicb { | |||
1283 | __le16 rid; | 1283 | __le16 rid; |
1284 | __le64 addr; | 1284 | __le64 addr; |
1285 | __le64 cnsmr_idx_addr; | 1285 | __le64 cnsmr_idx_addr; |
1286 | } __attribute((packed)); | 1286 | } __packed; |
1287 | 1287 | ||
1288 | /* | 1288 | /* |
1289 | * rx ring initialization control block for chip. | 1289 | * rx ring initialization control block for chip. |
@@ -1317,7 +1317,7 @@ struct cqicb { | |||
1317 | __le64 sbq_addr; | 1317 | __le64 sbq_addr; |
1318 | __le16 sbq_buf_size; | 1318 | __le16 sbq_buf_size; |
1319 | __le16 sbq_len; /* entry count */ | 1319 | __le16 sbq_len; /* entry count */ |
1320 | } __attribute((packed)); | 1320 | } __packed; |
1321 | 1321 | ||
1322 | struct ricb { | 1322 | struct ricb { |
1323 | u8 base_cq; | 1323 | u8 base_cq; |
@@ -1335,7 +1335,7 @@ struct ricb { | |||
1335 | u8 hash_cq_id[1024]; | 1335 | u8 hash_cq_id[1024]; |
1336 | __le32 ipv6_hash_key[10]; | 1336 | __le32 ipv6_hash_key[10]; |
1337 | __le32 ipv4_hash_key[4]; | 1337 | __le32 ipv4_hash_key[4]; |
1338 | } __attribute((packed)); | 1338 | } __packed; |
1339 | 1339 | ||
1340 | /* SOFTWARE/DRIVER DATA STRUCTURES. */ | 1340 | /* SOFTWARE/DRIVER DATA STRUCTURES. */ |
1341 | 1341 | ||