diff options
Diffstat (limited to 'drivers/net/e1000/e1000.h')
-rw-r--r-- | drivers/net/e1000/e1000.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index 19e317eaf5bc..62f62970f978 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
@@ -155,8 +155,6 @@ do { \ | |||
155 | #endif | 155 | #endif |
156 | 156 | ||
157 | #define E1000_MNG_VLAN_NONE (-1) | 157 | #define E1000_MNG_VLAN_NONE (-1) |
158 | /* Number of packet split data buffers (not including the header buffer) */ | ||
159 | #define PS_PAGE_BUFFERS (MAX_PS_BUFFERS - 1) | ||
160 | 158 | ||
161 | /* wrapper around a pointer to a socket buffer, | 159 | /* wrapper around a pointer to a socket buffer, |
162 | * so a DMA handle can be stored along with the buffer */ | 160 | * so a DMA handle can be stored along with the buffer */ |
@@ -168,14 +166,6 @@ struct e1000_buffer { | |||
168 | u16 next_to_watch; | 166 | u16 next_to_watch; |
169 | }; | 167 | }; |
170 | 168 | ||
171 | struct e1000_ps_page { | ||
172 | struct page *ps_page[PS_PAGE_BUFFERS]; | ||
173 | }; | ||
174 | |||
175 | struct e1000_ps_page_dma { | ||
176 | u64 ps_page_dma[PS_PAGE_BUFFERS]; | ||
177 | }; | ||
178 | |||
179 | struct e1000_tx_ring { | 169 | struct e1000_tx_ring { |
180 | /* pointer to the descriptor ring memory */ | 170 | /* pointer to the descriptor ring memory */ |
181 | void *desc; | 171 | void *desc; |
@@ -213,9 +203,6 @@ struct e1000_rx_ring { | |||
213 | unsigned int next_to_clean; | 203 | unsigned int next_to_clean; |
214 | /* array of buffer information structs */ | 204 | /* array of buffer information structs */ |
215 | struct e1000_buffer *buffer_info; | 205 | struct e1000_buffer *buffer_info; |
216 | /* arrays of page information for packet split */ | ||
217 | struct e1000_ps_page *ps_page; | ||
218 | struct e1000_ps_page_dma *ps_page_dma; | ||
219 | 206 | ||
220 | /* cpu for rx queue */ | 207 | /* cpu for rx queue */ |
221 | int cpu; | 208 | int cpu; |
@@ -228,8 +215,6 @@ struct e1000_rx_ring { | |||
228 | ((((R)->next_to_clean > (R)->next_to_use) \ | 215 | ((((R)->next_to_clean > (R)->next_to_use) \ |
229 | ? 0 : (R)->count) + (R)->next_to_clean - (R)->next_to_use - 1) | 216 | ? 0 : (R)->count) + (R)->next_to_clean - (R)->next_to_use - 1) |
230 | 217 | ||
231 | #define E1000_RX_DESC_PS(R, i) \ | ||
232 | (&(((union e1000_rx_desc_packet_split *)((R).desc))[i])) | ||
233 | #define E1000_RX_DESC_EXT(R, i) \ | 218 | #define E1000_RX_DESC_EXT(R, i) \ |
234 | (&(((union e1000_rx_desc_extended *)((R).desc))[i])) | 219 | (&(((union e1000_rx_desc_extended *)((R).desc))[i])) |
235 | #define E1000_GET_DESC(R, i, type) (&(((struct type *)((R).desc))[i])) | 220 | #define E1000_GET_DESC(R, i, type) (&(((struct type *)((R).desc))[i])) |
@@ -311,10 +296,8 @@ struct e1000_adapter { | |||
311 | u32 rx_int_delay; | 296 | u32 rx_int_delay; |
312 | u32 rx_abs_int_delay; | 297 | u32 rx_abs_int_delay; |
313 | bool rx_csum; | 298 | bool rx_csum; |
314 | unsigned int rx_ps_pages; | ||
315 | u32 gorcl; | 299 | u32 gorcl; |
316 | u64 gorcl_old; | 300 | u64 gorcl_old; |
317 | u16 rx_ps_bsize0; | ||
318 | 301 | ||
319 | /* OS defined structs */ | 302 | /* OS defined structs */ |
320 | struct net_device *netdev; | 303 | struct net_device *netdev; |