aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/ethtool.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/uapi/linux/ethtool.h')
-rw-r--r--include/uapi/linux/ethtool.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 7363f18e65a5..dc69391d2bba 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -870,7 +870,8 @@ struct ethtool_flow_ext {
870 * includes the %FLOW_EXT or %FLOW_MAC_EXT flag 870 * includes the %FLOW_EXT or %FLOW_MAC_EXT flag
871 * (see &struct ethtool_flow_ext description). 871 * (see &struct ethtool_flow_ext description).
872 * @ring_cookie: RX ring/queue index to deliver to, or %RX_CLS_FLOW_DISC 872 * @ring_cookie: RX ring/queue index to deliver to, or %RX_CLS_FLOW_DISC
873 * if packets should be discarded 873 * if packets should be discarded, or %RX_CLS_FLOW_WAKE if the
874 * packets should be used for Wake-on-LAN with %WAKE_FILTER
874 * @location: Location of rule in the table. Locations must be 875 * @location: Location of rule in the table. Locations must be
875 * numbered such that a flow matching multiple rules will be 876 * numbered such that a flow matching multiple rules will be
876 * classified according to the first (lowest numbered) rule. 877 * classified according to the first (lowest numbered) rule.
@@ -902,13 +903,13 @@ struct ethtool_rx_flow_spec {
902static inline __u64 ethtool_get_flow_spec_ring(__u64 ring_cookie) 903static inline __u64 ethtool_get_flow_spec_ring(__u64 ring_cookie)
903{ 904{
904 return ETHTOOL_RX_FLOW_SPEC_RING & ring_cookie; 905 return ETHTOOL_RX_FLOW_SPEC_RING & ring_cookie;
905}; 906}
906 907
907static inline __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie) 908static inline __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie)
908{ 909{
909 return (ETHTOOL_RX_FLOW_SPEC_RING_VF & ring_cookie) >> 910 return (ETHTOOL_RX_FLOW_SPEC_RING_VF & ring_cookie) >>
910 ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF; 911 ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF;
911}; 912}
912 913
913/** 914/**
914 * struct ethtool_rxnfc - command to get or set RX flow classification rules 915 * struct ethtool_rxnfc - command to get or set RX flow classification rules
@@ -1634,6 +1635,7 @@ static inline int ethtool_validate_duplex(__u8 duplex)
1634#define WAKE_ARP (1 << 4) 1635#define WAKE_ARP (1 << 4)
1635#define WAKE_MAGIC (1 << 5) 1636#define WAKE_MAGIC (1 << 5)
1636#define WAKE_MAGICSECURE (1 << 6) /* only meaningful if WAKE_MAGIC */ 1637#define WAKE_MAGICSECURE (1 << 6) /* only meaningful if WAKE_MAGIC */
1638#define WAKE_FILTER (1 << 7)
1637 1639
1638/* L2-L4 network traffic flow types */ 1640/* L2-L4 network traffic flow types */
1639#define TCP_V4_FLOW 0x01 /* hash or spec (tcp_ip4_spec) */ 1641#define TCP_V4_FLOW 0x01 /* hash or spec (tcp_ip4_spec) */
@@ -1671,6 +1673,7 @@ static inline int ethtool_validate_duplex(__u8 duplex)
1671#define RXH_DISCARD (1 << 31) 1673#define RXH_DISCARD (1 << 31)
1672 1674
1673#define RX_CLS_FLOW_DISC 0xffffffffffffffffULL 1675#define RX_CLS_FLOW_DISC 0xffffffffffffffffULL
1676#define RX_CLS_FLOW_WAKE 0xfffffffffffffffeULL
1674 1677
1675/* Special RX classification rule insert location values */ 1678/* Special RX classification rule insert location values */
1676#define RX_CLS_LOC_SPECIAL 0x80000000 /* flag */ 1679#define RX_CLS_LOC_SPECIAL 0x80000000 /* flag */