diff options
Diffstat (limited to 'include/linux/ethtool.h')
-rw-r--r-- | include/linux/ethtool.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 4b3ba05b11a8..d64e246a39e7 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
@@ -353,20 +353,7 @@ struct ethtool_ah_espip4_spec { | |||
353 | __u8 tos; | 353 | __u8 tos; |
354 | }; | 354 | }; |
355 | 355 | ||
356 | struct ethtool_rawip4_spec { | ||
357 | __be32 ip4src; | ||
358 | __be32 ip4dst; | ||
359 | __u8 hdata[64]; | ||
360 | }; | ||
361 | |||
362 | struct ethtool_ether_spec { | ||
363 | __be16 ether_type; | ||
364 | __u8 frame_size; | ||
365 | __u8 eframe[16]; | ||
366 | }; | ||
367 | |||
368 | #define ETH_RX_NFC_IP4 1 | 356 | #define ETH_RX_NFC_IP4 1 |
369 | #define ETH_RX_NFC_IP6 2 | ||
370 | 357 | ||
371 | /** | 358 | /** |
372 | * struct ethtool_usrip4_spec - general flow specification for IPv4 | 359 | * struct ethtool_usrip4_spec - general flow specification for IPv4 |
@@ -403,10 +390,8 @@ struct ethtool_rx_flow_spec { | |||
403 | struct ethtool_tcpip4_spec sctp_ip4_spec; | 390 | struct ethtool_tcpip4_spec sctp_ip4_spec; |
404 | struct ethtool_ah_espip4_spec ah_ip4_spec; | 391 | struct ethtool_ah_espip4_spec ah_ip4_spec; |
405 | struct ethtool_ah_espip4_spec esp_ip4_spec; | 392 | struct ethtool_ah_espip4_spec esp_ip4_spec; |
406 | struct ethtool_rawip4_spec raw_ip4_spec; | ||
407 | struct ethtool_ether_spec ether_spec; | ||
408 | struct ethtool_usrip4_spec usr_ip4_spec; | 393 | struct ethtool_usrip4_spec usr_ip4_spec; |
409 | __u8 hdata[64]; | 394 | __u8 hdata[72]; |
410 | } h_u, m_u; | 395 | } h_u, m_u; |
411 | __u64 ring_cookie; | 396 | __u64 ring_cookie; |
412 | __u32 location; | 397 | __u32 location; |
@@ -496,10 +481,8 @@ struct ethtool_rx_ntuple_flow_spec { | |||
496 | struct ethtool_tcpip4_spec sctp_ip4_spec; | 481 | struct ethtool_tcpip4_spec sctp_ip4_spec; |
497 | struct ethtool_ah_espip4_spec ah_ip4_spec; | 482 | struct ethtool_ah_espip4_spec ah_ip4_spec; |
498 | struct ethtool_ah_espip4_spec esp_ip4_spec; | 483 | struct ethtool_ah_espip4_spec esp_ip4_spec; |
499 | struct ethtool_rawip4_spec raw_ip4_spec; | ||
500 | struct ethtool_ether_spec ether_spec; | ||
501 | struct ethtool_usrip4_spec usr_ip4_spec; | 484 | struct ethtool_usrip4_spec usr_ip4_spec; |
502 | __u8 hdata[64]; | 485 | __u8 hdata[72]; |
503 | } h_u, m_u; | 486 | } h_u, m_u; |
504 | 487 | ||
505 | __u16 vlan_tag; | 488 | __u16 vlan_tag; |