1 files changed, 31 insertions, 32 deletions

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 8f73be494503..ff33f498c137 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -294,6 +294,7 @@ struct ipv6_fl_socklist {
 };
 
 struct ipcm6_cookie {
+        struct sockcm_cookie sockc;
         __s16 hlimit;
         __s16 tclass;
         __s8  dontfrag;
@@ -301,6 +302,25 @@ struct ipcm6_cookie {
         __u16 gso_size;
 };
 
+static inline void ipcm6_init(struct ipcm6_cookie *ipc6)
+{
+        *ipc6 = (struct ipcm6_cookie) {
+                .hlimit = -1,
+                .tclass = -1,
+                .dontfrag = -1,
+        };
+}
+
+static inline void ipcm6_init_sk(struct ipcm6_cookie *ipc6,
+                                 const struct ipv6_pinfo *np)
+{
+        *ipc6 = (struct ipcm6_cookie) {
+                .hlimit = -1,
+                .tclass = np->tclass,
+                .dontfrag = np->dontfrag,
+        };
+}
+
 static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np)
 {
         struct ipv6_txoptions *opt;
@@ -554,34 +574,6 @@ static inline bool ipv6_prefix_equal(const struct in6_addr *addr1,
 }
 #endif
 
-struct inet_frag_queue;
-
-enum ip6_defrag_users {
-        IP6_DEFRAG_LOCAL_DELIVER,
-        IP6_DEFRAG_CONNTRACK_IN,
-        __IP6_DEFRAG_CONNTRACK_IN       = IP6_DEFRAG_CONNTRACK_IN + USHRT_MAX,
-        IP6_DEFRAG_CONNTRACK_OUT,
-        __IP6_DEFRAG_CONNTRACK_OUT      = IP6_DEFRAG_CONNTRACK_OUT + USHRT_MAX,
-        IP6_DEFRAG_CONNTRACK_BRIDGE_IN,
-        __IP6_DEFRAG_CONNTRACK_BRIDGE_IN = IP6_DEFRAG_CONNTRACK_BRIDGE_IN + USHRT_MAX,
-};
-
-void ip6_frag_init(struct inet_frag_queue *q, const void *a);
-extern const struct rhashtable_params ip6_rhash_params;
-
-/*
- *      Equivalent of ipv4 struct ip
- */
-struct frag_queue {
-        struct inet_frag_queue  q;
-
-        int                     iif;
-        __u16                   nhoffset;
-        u8                      ecn;
-};
-
-void ip6_expire_frag_queue(struct net *net, struct frag_queue *fq);
-
 static inline bool ipv6_addr_any(const struct in6_addr *a)
 {
 #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
@@ -790,6 +782,13 @@ static inline void iph_to_flow_copy_v6addrs(struct flow_keys *flow,
 
 #if IS_ENABLED(CONFIG_IPV6)
 
+static inline bool ipv6_can_nonlocal_bind(struct net *net,
+                                          struct inet_sock *inet)
+{
+        return net->ipv6.sysctl.ip_nonlocal_bind ||
+                inet->freebind || inet->transparent;
+}
+
 /* Sysctl settings for net ipv6.auto_flowlabels */
 #define IP6_AUTO_FLOW_LABEL_OFF         0
 #define IP6_AUTO_FLOW_LABEL_OPTOUT      1
@@ -915,6 +914,8 @@ static inline __be32 flowi6_get_flowlabel(const struct flowi6 *fl6)
 
 int ipv6_rcv(struct sk_buff *skb, struct net_device *dev,
              struct packet_type *pt, struct net_device *orig_dev);
+void ipv6_list_rcv(struct list_head *head, struct packet_type *pt,
+                   struct net_device *orig_dev);
 
 int ip6_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
 
@@ -931,8 +932,7 @@ int ip6_append_data(struct sock *sk,
                                 int odd, struct sk_buff *skb),
                     void *from, int length, int transhdrlen,
                     struct ipcm6_cookie *ipc6, struct flowi6 *fl6,
-                    struct rt6_info *rt, unsigned int flags,
-                    const struct sockcm_cookie *sockc);
+                    struct rt6_info *rt, unsigned int flags);
 
 int ip6_push_pending_frames(struct sock *sk);
 
@@ -949,8 +949,7 @@ struct sk_buff *ip6_make_skb(struct sock *sk,
                              void *from, int length, int transhdrlen,
                              struct ipcm6_cookie *ipc6, struct flowi6 *fl6,
                              struct rt6_info *rt, unsigned int flags,
-                             struct inet_cork_full *cork,
-                             const struct sockcm_cookie *sockc);
+                             struct inet_cork_full *cork);
 
 static inline struct sk_buff *ip6_finish_skb(struct sock *sk)
 {