nx-match: Update register check functions.

[sliver-openvswitch.git] / datapath / tunnel.h

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index 6ce9c46..784cda1 100644 (file)
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -42,7 +42,8 @@
 
 /* All public tunnel flags. */
 #define TNL_F_PUBLIC (TNL_F_CSUM | TNL_F_TOS_INHERIT | TNL_F_TTL_INHERIT | \
-                     TNL_F_PMTUD | TNL_F_HDR_CACHE | TNL_F_IPSEC)
+                     TNL_F_DF_INHERIT | TNL_F_DF_DEFAULT | TNL_F_PMTUD | \
+                     TNL_F_HDR_CACHE | TNL_F_IPSEC)
 
 /**
  * struct tnl_mutable_config - modifiable configuration for a tunnel.
@@ -225,7 +226,7 @@ int tnl_set_addr(struct vport *vport, const unsigned char *addr);
 const char *tnl_get_name(const struct vport *vport);
 const unsigned char *tnl_get_addr(const struct vport *vport);
 int tnl_send(struct vport *vport, struct sk_buff *skb);
-void tnl_rcv(struct vport *vport, struct sk_buff *skb);
+void tnl_rcv(struct vport *vport, struct sk_buff *skb, u8 tos);
 
 struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be64 key,
                            int tunnel_type,