1 files changed, 19 insertions, 30 deletions

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index b21a7f06d6a4..1833c3f389ee 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -70,13 +70,14 @@ struct ip_options_data {
 
 struct inet_request_sock {
         struct request_sock     req;
-#if IS_ENABLED(CONFIG_IPV6)
-        u16                     inet6_rsk_offset;
-#endif
-        __be16                  loc_port;
-        __be32                  loc_addr;
-        __be32                  rmt_addr;
-        __be16                  rmt_port;
+#define ir_loc_addr             req.__req_common.skc_rcv_saddr
+#define ir_rmt_addr             req.__req_common.skc_daddr
+#define ir_num                  req.__req_common.skc_num
+#define ir_rmt_port             req.__req_common.skc_dport
+#define ir_v6_rmt_addr          req.__req_common.skc_v6_daddr
+#define ir_v6_loc_addr          req.__req_common.skc_v6_rcv_saddr
+#define ir_iif                  req.__req_common.skc_bound_dev_if
+
         kmemcheck_bitfield_begin(flags);
         u16                     snd_wscale : 4,
                                 rcv_wscale : 4,
@@ -88,6 +89,7 @@ struct inet_request_sock {
                                 no_srccheck: 1;
         kmemcheck_bitfield_end(flags);
         struct ip_options_rcu   *opt;
+        struct sk_buff          *pktopts;
 };
 
 static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk)
@@ -103,6 +105,9 @@ struct inet_cork {
         int                     length; /* Total length of all frames */
         struct dst_entry        *dst;
         u8                      tx_flags;
+        __u8                    ttl;
+        __s16                   tos;
+        char                    priority;
 };
 
 struct inet_cork_full {
@@ -143,10 +148,8 @@ struct inet_sock {
         /* Socket demultiplex comparisons on incoming packets. */
 #define inet_daddr              sk.__sk_common.skc_daddr
 #define inet_rcv_saddr          sk.__sk_common.skc_rcv_saddr
-#define inet_addrpair           sk.__sk_common.skc_addrpair
 #define inet_dport              sk.__sk_common.skc_dport
 #define inet_num                sk.__sk_common.skc_num
-#define inet_portpair           sk.__sk_common.skc_portpair
 
         __be32                  inet_saddr;
         __s16                   uc_ttl;
@@ -199,32 +202,18 @@ static inline void inet_sk_copy_descendant(struct sock *sk_to,
 }
 #endif
 
-extern int inet_sk_rebuild_header(struct sock *sk);
-
-extern u32 inet_ehash_secret;
-extern u32 ipv6_hash_secret;
-extern void build_ehash_secret(void);
+int inet_sk_rebuild_header(struct sock *sk);
 
-static inline unsigned int inet_ehashfn(struct net *net,
-                                        const __be32 laddr, const __u16 lport,
-                                        const __be32 faddr, const __be16 fport)
+static inline unsigned int __inet_ehashfn(const __be32 laddr,
+                                          const __u16 lport,
+                                          const __be32 faddr,
+                                          const __be16 fport,
+                                          u32 initval)
 {
         return jhash_3words((__force __u32) laddr,
                             (__force __u32) faddr,
                             ((__u32) lport) << 16 | (__force __u32)fport,
-                            inet_ehash_secret + net_hash_mix(net));
-}
-
-static inline int inet_sk_ehashfn(const struct sock *sk)
-{
-        const struct inet_sock *inet = inet_sk(sk);
-        const __be32 laddr = inet->inet_rcv_saddr;
-        const __u16 lport = inet->inet_num;
-        const __be32 faddr = inet->inet_daddr;
-        const __be16 fport = inet->inet_dport;
-        struct net *net = sock_net(sk);
-
-        return inet_ehashfn(net, laddr, lport, faddr, fport);
+                            initval);
 }
 
 static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops)