3 files changed, 11 insertions, 9 deletions
diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index 5f84c6229dc6..610208b18c05 100644
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -47,15 +47,6 @@ ip6t_ext_hdr(u8 nexthdr)
               (nexthdr == IPPROTO_DSTOPTS);
 }
-enum {
-        IP6T_FH_F_FRAG  = (1 << 0),
-        IP6T_FH_F_AUTH  = (1 << 1),
-};
-/* find specified header and get offset to it */
-extern int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
-                         int target, unsigned short *fragoff, int *fragflg);
 #ifdef CONFIG_COMPAT
 #include <net/compat.h>
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h
index eb1efa54fe84..d42e174bd0c8 100644
--- a/include/linux/openvswitch.h
+++ b/include/linux/openvswitch.h
@@ -243,6 +243,7 @@ enum ovs_key_attr {
        OVS_KEY_ATTR_ICMPV6,    /* struct ovs_key_icmpv6 */
        OVS_KEY_ATTR_ARP,       /* struct ovs_key_arp */
        OVS_KEY_ATTR_ND,        /* struct ovs_key_nd */
+        OVS_KEY_ATTR_SKB_MARK,  /* u32 skb mark */
        __OVS_KEY_ATTR_MAX
 };
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 979bf6c13141..acbd8e034310 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -630,6 +630,16 @@ extern int			ipv6_skip_exthdr(const struct sk_buff *, int start,
 extern bool                     ipv6_ext_hdr(u8 nexthdr);
+enum {
+        IP6_FH_F_FRAG           = (1 << 0),
+        IP6_FH_F_AUTH           = (1 << 1),
+        IP6_FH_F_SKIP_RH        = (1 << 2),
+};
+/* find specified header and get offset to it */
+extern int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
+                         int target, unsigned short *fragoff, int *fragflg);
 extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type);
 extern struct in6_addr *fl6_update_dst(struct flowi6 *fl6,