flow_dissector: Dissect tos and ttl from the tunnel info

[sfrench/cifs-2.6.git] / include / net / flow_dissector.h

diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h
index adc24df56b907d4598a1b08d4ab5da01eddc0c85..2a17f041f7a1742e069e7c6d49658251e45519e3 100644 (file)
--- a/include/net/flow_dissector.h
+++ b/include/net/flow_dissector.h
@@ -47,7 +47,7 @@ struct flow_dissector_key_tags {
 struct flow_dissector_key_vlan {
        u16     vlan_id:12,
                vlan_priority:3;
-       u16     padding;
+       __be16  vlan_tpid;
 };
 
 struct flow_dissector_key_mpls {
@@ -206,7 +206,8 @@ enum flow_dissector_key_id {
        FLOW_DISSECTOR_KEY_MPLS, /* struct flow_dissector_key_mpls */
        FLOW_DISSECTOR_KEY_TCP, /* struct flow_dissector_key_tcp */
        FLOW_DISSECTOR_KEY_IP, /* struct flow_dissector_key_ip */
-
+       FLOW_DISSECTOR_KEY_CVLAN, /* struct flow_dissector_key_flow_vlan */
+       FLOW_DISSECTOR_KEY_ENC_IP, /* struct flow_dissector_key_ip */
        FLOW_DISSECTOR_KEY_MAX,
 };
 
@@ -237,6 +238,7 @@ struct flow_keys {
        struct flow_dissector_key_basic basic;
        struct flow_dissector_key_tags tags;
        struct flow_dissector_key_vlan vlan;
+       struct flow_dissector_key_vlan cvlan;
        struct flow_dissector_key_keyid keyid;
        struct flow_dissector_key_ports ports;
        struct flow_dissector_key_addrs addrs;