diff options
| -rw-r--r-- | ethtool.8.in | 5 | ||||
| -rw-r--r-- | rxclass.c | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ethtool.8.in b/ethtool.8.in index 2983b3e..7a0bd43 100644 --- a/ethtool.8.in +++ b/ethtool.8.in @@ -296,6 +296,7 @@ ethtool \- query or control network driver and hardware settings .BM src\-port .BM dst\-port .BM spi +.BM l4data .BM vlan\-etype .BM vlan .BM user\-def @@ -720,6 +721,10 @@ Specify the value of the security parameter index field (applicable to AH/ESP packets)in the incoming packet to match along with an optional mask. Valid for flow-types ip4, ah4, and esp4. .TP +.BI l4data \ N \\fR\ [\\fPm \ N \\fR]\\fP +Specify the value of the first 4 Bytes of Layer 4 in the incoming packet to +match along with an optional mask. Valid for ip4 flow-type. +.TP .BI vlan\-etype \ N \\fR\ [\\fPm \ N \\fR]\\fP Includes the VLAN tag Ethertype and an optional mask. .TP @@ -622,6 +622,9 @@ static struct rule_opts rule_nfc_usr_ip4[] = { { "l4proto", OPT_U8, NFC_FLAG_PROTO, offsetof(struct ethtool_rx_flow_spec, h_u.usr_ip4_spec.proto), offsetof(struct ethtool_rx_flow_spec, m_u.usr_ip4_spec.proto) }, + { "l4data", OPT_BE32, NFC_FLAG_SPI, + offsetof(struct ethtool_rx_flow_spec, h_u.usr_ip4_spec.l4_4_bytes), + offsetof(struct ethtool_rx_flow_spec, m_u.usr_ip4_spec.l4_4_bytes) }, { "spi", OPT_BE32, NFC_FLAG_SPI, offsetof(struct ethtool_rx_flow_spec, h_u.usr_ip4_spec.l4_4_bytes), offsetof(struct ethtool_rx_flow_spec, m_u.usr_ip4_spec.l4_4_bytes) }, @@ -648,11 +651,11 @@ static struct rule_opts rule_nfc_usr_ip4[] = { static struct rule_opts rule_nfc_ether[] = { { "src", OPT_MAC, NFC_FLAG_SADDR, - offsetof(struct ethtool_rx_flow_spec, h_u.ether_spec.h_dest), - offsetof(struct ethtool_rx_flow_spec, m_u.ether_spec.h_dest) }, - { "dst", OPT_MAC, NFC_FLAG_DADDR, offsetof(struct ethtool_rx_flow_spec, h_u.ether_spec.h_source), offsetof(struct ethtool_rx_flow_spec, m_u.ether_spec.h_source) }, + { "dst", OPT_MAC, NFC_FLAG_DADDR, + offsetof(struct ethtool_rx_flow_spec, h_u.ether_spec.h_dest), + offsetof(struct ethtool_rx_flow_spec, m_u.ether_spec.h_dest) }, { "proto", OPT_BE16, NFC_FLAG_PROTO, offsetof(struct ethtool_rx_flow_spec, h_u.ether_spec.h_proto), offsetof(struct ethtool_rx_flow_spec, m_u.ether_spec.h_proto) }, @@ -1062,6 +1065,8 @@ int rxclass_parse_ruleopts(char **argp, int argc, } } + if (flow_type == IP_USER_FLOW) + fsp->h_u.usr_ip4_spec.ip_ver = ETH_RX_NFC_IP4; if (flags & (NTUPLE_FLAG_VLAN | NTUPLE_FLAG_UDEF | NTUPLE_FLAG_VETH)) fsp->flow_type |= FLOW_EXT; |