flow dissector: ICMP support

Allow dissection of ICMP(V6) type and code. This should only occur
if a packet is ICMP(V6) and the dissector has FLOW_DISSECTOR_KEY_ICMP set.

There are currently no users of FLOW_DISSECTOR_KEY_ICMP.
A follow-up patch will allow FLOW_DISSECTOR_KEY_ICMP to be used by
the flower classifier.

Signed-off-by: Simon Horman <simon.horman@netronome.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 17 insertions, 0 deletions

diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h
index c4f31666afd2..d896a33e00d4 100644
--- a/include/net/flow_dissector.h
+++ b/include/net/flow_dissector.h
@@ -104,6 +104,22 @@ struct flow_dissector_key_ports {
         };
 };
 
+/**
+ * flow_dissector_key_icmp:
+ *      @ports: type and code of ICMP header
+ *              icmp: ICMP type (high) and code (low)
+ *              type: ICMP type
+ *              code: ICMP code
+ */
+struct flow_dissector_key_icmp {
+        union {
+                __be16 icmp;
+                struct {
+                        u8 type;
+                        u8 code;
+                };
+        };
+};
 
 /**
  * struct flow_dissector_key_eth_addrs:
@@ -122,6 +138,7 @@ enum flow_dissector_key_id {
         FLOW_DISSECTOR_KEY_IPV4_ADDRS, /* struct flow_dissector_key_ipv4_addrs */
         FLOW_DISSECTOR_KEY_IPV6_ADDRS, /* struct flow_dissector_key_ipv6_addrs */
         FLOW_DISSECTOR_KEY_PORTS, /* struct flow_dissector_key_ports */
+        FLOW_DISSECTOR_KEY_ICMP, /* struct flow_dissector_key_icmp */
         FLOW_DISSECTOR_KEY_ETH_ADDRS, /* struct flow_dissector_key_eth_addrs */
         FLOW_DISSECTOR_KEY_TIPC_ADDRS, /* struct flow_dissector_key_tipc_addrs */
         FLOW_DISSECTOR_KEY_VLAN, /* struct flow_dissector_key_flow_vlan */