dpif-netlink: add GENEVE creation support

[cascardo/ovs.git] / datapath / datapath.h

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 9f3d7b2..ceb3372 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -31,7 +31,6 @@
 #include "compat.h"
 #include "flow.h"
 #include "flow_table.h"
-#include "vlan.h"
 
 #define DP_MAX_PORTS           USHRT_MAX
 #define DP_VPORT_HASH_BUCKETS  1024
@@ -97,9 +96,12 @@ struct datapath {
  * struct ovs_skb_cb - OVS data in skb CB
  * @input_vport: The original vport packet came in on. This value is cached
  * when a packet is received by OVS.
+ * @mru: The maximum received fragement size; 0 if the packet is not
+ * fragmented.
  */
 struct ovs_skb_cb {
        struct vport            *input_vport;
+       u16                     mru;
 };
 #define OVS_CB(skb) ((struct ovs_skb_cb *)(skb)->cb)
 
@@ -112,6 +114,7 @@ struct ovs_skb_cb {
  * then no packet is sent and the packet is accounted in the datapath's @n_lost
  * counter.
  * @egress_tun_info: If nonnull, becomes %OVS_PACKET_ATTR_EGRESS_TUN_KEY.
+ * @mru: If not zero, Maximum received IP fragment size.
  */
 struct dp_upcall_info {
        struct ip_tunnel_info *egress_tun_info;
@@ -121,6 +124,7 @@ struct dp_upcall_info {
        int actions_len;
        u32 portid;
        u8 cmd;
+       u16 mru;
 };
 
 /**
@@ -131,6 +135,9 @@ struct dp_upcall_info {
 struct ovs_net {
        struct list_head dps;
        struct work_struct dp_notify_work;
+
+       /* Module reference for configuring conntrack. */
+       bool xt_label;
 };
 
 extern int ovs_net_id;