Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[karo-tx-linux.git] / include / net / flow_dissector.h

diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h
index bb81e3b576e709272a40efd0948de44915f7bce3..8c8548cf5888c4535a809494fad454e755ff6749 100644 (file)
--- a/include/net/flow_dissector.h
+++ b/include/net/flow_dissector.h
@@ -12,10 +12,13 @@
 struct flow_dissector_key_control {
        u16     thoff;
        u16     addr_type;
-       u32     is_fragment:1;
-       u32     first_frag:1;
+       u32     flags;
 };
 
+#define FLOW_DIS_IS_FRAGMENT   BIT(0)
+#define FLOW_DIS_FIRST_FRAG    BIT(1)
+#define FLOW_DIS_ENCAPSULATION BIT(2)
+
 /**
  * struct flow_dissector_key_basic:
  * @thoff: Transport header offset
@@ -126,6 +129,8 @@ enum flow_dissector_key_id {
 
 #define FLOW_DISSECTOR_F_PARSE_1ST_FRAG                BIT(0)
 #define FLOW_DISSECTOR_F_STOP_AT_L3            BIT(1)
+#define FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL    BIT(2)
+#define FLOW_DISSECTOR_F_STOP_AT_ENCAP         BIT(3)
 
 struct flow_dissector_key {
        enum flow_dissector_key_id key_id;