Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 2544f9760a4263b7f1b8d622331ca63038586137..987cc4569cb8ba6159946f9e87feb04cb681ac8c 100644 (file)
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ipv6 in net namespaces
  */
@@ -37,6 +38,10 @@ struct netns_sysctl_ipv6 {
        int idgen_delay;
        int flowlabel_state_ranges;
        int flowlabel_reflect;
+       int max_dst_opts_cnt;
+       int max_hbh_opts_cnt;
+       int max_dst_opts_len;
+       int max_hbh_opts_len;
 };
 
 struct netns_ipv6 {
@@ -89,6 +94,11 @@ struct netns_ipv6 {
        atomic_t                fib6_sernum;
        struct seg6_pernet_data *seg6_data;
        struct fib_notifier_ops *notifier_ops;
+       struct {
+               struct hlist_head head;
+               spinlock_t      lock;
+               u32             seq;
+       } ip6addrlbl_table;
 };
 
 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)