diff options
author | Ron Mercer <ron.mercer@qlogic.com> | 2008-07-31 16:46:07 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 02:11:14 -0400 |
commit | 4ea0d6e5b8dc6c46c1a981e971fa0b78bfe6e5d3 (patch) | |
tree | 92c697d64a0256e4b4910c2787feb5695fe1470b /drivers/net/qla3xxx.h | |
parent | 6bc0ed97d5ddb49248cfb76827d72557f4bd0aae (diff) |
qla3xxx: cleanup: Remove some unused structure definitions and structure elements.
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/qla3xxx.h')
-rw-r--r-- | drivers/net/qla3xxx.h | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/drivers/net/qla3xxx.h b/drivers/net/qla3xxx.h index e0655f996610..7113e71b15a1 100644 --- a/drivers/net/qla3xxx.h +++ b/drivers/net/qla3xxx.h | |||
@@ -22,8 +22,6 @@ | |||
22 | 22 | ||
23 | #define OPCODE_FUNC_ID_MASK 0x30 | 23 | #define OPCODE_FUNC_ID_MASK 0x30 |
24 | #define OUTBOUND_MAC_IOCB 0x01 /* plus function bits */ | 24 | #define OUTBOUND_MAC_IOCB 0x01 /* plus function bits */ |
25 | #define OUTBOUND_TCP_IOCB 0x03 /* plus function bits */ | ||
26 | #define UPDATE_NCB_IOCB 0x00 /* plus function bits */ | ||
27 | 25 | ||
28 | #define FN0_MA_BITS_MASK 0x00 | 26 | #define FN0_MA_BITS_MASK 0x00 |
29 | #define FN1_MA_BITS_MASK 0x80 | 27 | #define FN1_MA_BITS_MASK 0x80 |
@@ -151,75 +149,6 @@ struct ob_ip_iocb_rsp { | |||
151 | __le32 reserved2; | 149 | __le32 reserved2; |
152 | }; | 150 | }; |
153 | 151 | ||
154 | struct ob_tcp_iocb_req { | ||
155 | u8 opcode; | ||
156 | |||
157 | u8 flags0; | ||
158 | #define OB_TCP_IOCB_REQ_P 0x80 | ||
159 | #define OB_TCP_IOCB_REQ_CI 0x20 | ||
160 | #define OB_TCP_IOCB_REQ_H 0x10 | ||
161 | #define OB_TCP_IOCB_REQ_LN 0x08 | ||
162 | #define OB_TCP_IOCB_REQ_K 0x04 | ||
163 | #define OB_TCP_IOCB_REQ_D 0x02 | ||
164 | #define OB_TCP_IOCB_REQ_I 0x01 | ||
165 | |||
166 | u8 flags1; | ||
167 | #define OB_TCP_IOCB_REQ_OSM 0x40 | ||
168 | #define OB_TCP_IOCB_REQ_URG 0x20 | ||
169 | #define OB_TCP_IOCB_REQ_ACK 0x10 | ||
170 | #define OB_TCP_IOCB_REQ_PSH 0x08 | ||
171 | #define OB_TCP_IOCB_REQ_RST 0x04 | ||
172 | #define OB_TCP_IOCB_REQ_SYN 0x02 | ||
173 | #define OB_TCP_IOCB_REQ_FIN 0x01 | ||
174 | |||
175 | u8 options_len; | ||
176 | #define OB_TCP_IOCB_REQ_OMASK 0xF0 | ||
177 | #define OB_TCP_IOCB_REQ_SHIFT 4 | ||
178 | |||
179 | __le32 transaction_id; | ||
180 | __le32 data_len; | ||
181 | __le32 hncb_ptr_low; | ||
182 | __le32 hncb_ptr_high; | ||
183 | __le32 buf_addr0_low; | ||
184 | __le32 buf_addr0_high; | ||
185 | __le32 buf_0_len; | ||
186 | __le32 buf_addr1_low; | ||
187 | __le32 buf_addr1_high; | ||
188 | __le32 buf_1_len; | ||
189 | __le32 buf_addr2_low; | ||
190 | __le32 buf_addr2_high; | ||
191 | __le32 buf_2_len; | ||
192 | __le32 time_stamp; | ||
193 | __le32 reserved1; | ||
194 | }; | ||
195 | |||
196 | struct ob_tcp_iocb_rsp { | ||
197 | u8 opcode; | ||
198 | |||
199 | u8 flags0; | ||
200 | #define OB_TCP_IOCB_RSP_C 0x20 | ||
201 | #define OB_TCP_IOCB_RSP_H 0x10 | ||
202 | #define OB_TCP_IOCB_RSP_LN 0x08 | ||
203 | #define OB_TCP_IOCB_RSP_K 0x04 | ||
204 | #define OB_TCP_IOCB_RSP_D 0x02 | ||
205 | #define OB_TCP_IOCB_RSP_I 0x01 | ||
206 | |||
207 | u8 flags1; | ||
208 | #define OB_TCP_IOCB_RSP_E 0x10 | ||
209 | #define OB_TCP_IOCB_RSP_W 0x08 | ||
210 | #define OB_TCP_IOCB_RSP_P 0x04 | ||
211 | #define OB_TCP_IOCB_RSP_T 0x02 | ||
212 | #define OB_TCP_IOCB_RSP_F 0x01 | ||
213 | |||
214 | u8 state; | ||
215 | #define OB_TCP_IOCB_RSP_SMASK 0xF0 | ||
216 | #define OB_TCP_IOCB_RSP_SHIFT 4 | ||
217 | |||
218 | __le32 transaction_id; | ||
219 | __le32 local_ncb_ptr; | ||
220 | __le32 reserved0; | ||
221 | }; | ||
222 | |||
223 | struct ib_ip_iocb_rsp { | 152 | struct ib_ip_iocb_rsp { |
224 | u8 opcode; | 153 | u8 opcode; |
225 | #define IB_IP_IOCB_RSP_3032_V 0x80 | 154 | #define IB_IP_IOCB_RSP_3032_V 0x80 |
@@ -248,25 +177,6 @@ struct ib_ip_iocb_rsp { | |||
248 | __le32 ial_high; | 177 | __le32 ial_high; |
249 | }; | 178 | }; |
250 | 179 | ||
251 | struct ib_tcp_iocb_rsp { | ||
252 | u8 opcode; | ||
253 | u8 flags; | ||
254 | #define IB_TCP_IOCB_RSP_P 0x80 | ||
255 | #define IB_TCP_IOCB_RSP_T 0x40 | ||
256 | #define IB_TCP_IOCB_RSP_D 0x20 | ||
257 | #define IB_TCP_IOCB_RSP_N 0x10 | ||
258 | #define IB_TCP_IOCB_RSP_IP 0x03 | ||
259 | #define IB_TCP_FLAG_MASK 0xf0 | ||
260 | #define IB_TCP_FLAG_IOCB_SYN 0x00 | ||
261 | |||
262 | #define TCP_IB_RSP_FLAGS(x) (x->flags & ~IB_TCP_FLAG_MASK) | ||
263 | |||
264 | __le16 length; | ||
265 | __le32 hncb_ref_num; | ||
266 | __le32 ial_low; | ||
267 | __le32 ial_high; | ||
268 | }; | ||
269 | |||
270 | struct net_rsp_iocb { | 180 | struct net_rsp_iocb { |
271 | u8 opcode; | 181 | u8 opcode; |
272 | u8 flags; | 182 | u8 flags; |
@@ -1258,20 +1168,13 @@ struct ql3_adapter { | |||
1258 | u32 small_buf_release_cnt; | 1168 | u32 small_buf_release_cnt; |
1259 | u32 small_buf_total_size; | 1169 | u32 small_buf_total_size; |
1260 | 1170 | ||
1261 | /* ISR related, saves status for DPC. */ | ||
1262 | u32 control_status; | ||
1263 | |||
1264 | struct eeprom_data nvram_data; | 1171 | struct eeprom_data nvram_data; |
1265 | struct timer_list ioctl_timer; | ||
1266 | u32 port_link_state; | 1172 | u32 port_link_state; |
1267 | u32 last_rsp_offset; | ||
1268 | 1173 | ||
1269 | /* 4022 specific */ | 1174 | /* 4022 specific */ |
1270 | u32 mac_index; /* Driver's MAC number can be 0 or 1 for first and second networking functions respectively */ | 1175 | u32 mac_index; /* Driver's MAC number can be 0 or 1 for first and second networking functions respectively */ |
1271 | u32 PHYAddr; /* Address of PHY 0x1e00 Port 0 and 0x1f00 Port 1 */ | 1176 | u32 PHYAddr; /* Address of PHY 0x1e00 Port 0 and 0x1f00 Port 1 */ |
1272 | u32 mac_ob_opcode; /* Opcode to use on mac transmission */ | 1177 | u32 mac_ob_opcode; /* Opcode to use on mac transmission */ |
1273 | u32 tcp_ob_opcode; /* Opcode to use on tcp transmission */ | ||
1274 | u32 update_ob_opcode; /* Opcode to use for updating NCB */ | ||
1275 | u32 mb_bit_mask; /* MA Bits mask to use on transmission */ | 1178 | u32 mb_bit_mask; /* MA Bits mask to use on transmission */ |
1276 | u32 numPorts; | 1179 | u32 numPorts; |
1277 | struct workqueue_struct *workqueue; | 1180 | struct workqueue_struct *workqueue; |