Patched in Tegra support.

1 files changed, 10 insertions, 14 deletions

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index a4196cbc84e..b897d6e6d0a 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -31,7 +31,6 @@
 /** struct ip_options - IP Options
  *
  * @faddr - Saved first hop address
- * @nexthop - Saved nexthop address in LSRR and SSRR
  * @is_data - Options in __data, rather than skb
  * @is_strictroute - Strict source route
  * @srr_is_hit - Packet destination addr was our one
@@ -42,7 +41,6 @@
  */
 struct ip_options {
         __be32          faddr;
-        __be32          nexthop;
         unsigned char   optlen;
         unsigned char   srr;
         unsigned char   rr;
@@ -71,7 +69,7 @@ struct ip_options_data {
 
 struct inet_request_sock {
         struct request_sock     req;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         u16                     inet6_rsk_offset;
 #endif
         __be16                  loc_port;
@@ -101,8 +99,10 @@ struct inet_cork {
         __be32                  addr;
         struct ip_options       *opt;
         unsigned int            fragsize;
-        int                     length; /* Total length of all frames */
         struct dst_entry        *dst;
+        int                     length; /* Total length of all frames */
+        struct page             *page;
+        u32                     off;
         u8                      tx_flags;
 };
 
@@ -130,7 +130,6 @@ struct rtable;
  * @tos - TOS
  * @mc_ttl - Multicasting TTL
  * @is_icsk - is this an inet_connection_sock?
- * @uc_index - Unicast outgoing device index
  * @mc_index - Multicast device index
  * @mc_list - Group array
  * @cork - info to build ip hdr on each ip frag while socket is corked
@@ -138,17 +137,15 @@ struct rtable;
 struct inet_sock {
         /* sk and pinet6 has to be the first two members of inet_sock */
         struct sock             sk;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         struct ipv6_pinfo       *pinet6;
 #endif
         /* 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
 
+        __be16                  inet_dport;
+        __u16                   inet_num;
         __be32                  inet_saddr;
         __s16                   uc_ttl;
         __u16                   cmsg_flags;
@@ -156,7 +153,6 @@ struct inet_sock {
         __u16                   inet_id;
 
         struct ip_options_rcu __rcu     *inet_opt;
-        int                     rx_dst_ifindex;
         __u8                    tos;
         __u8                    min_ttl;
         __u8                    mc_ttl;
@@ -169,8 +165,6 @@ struct inet_sock {
                                 transparent:1,
                                 mc_all:1,
                                 nodefrag:1;
-        __u8                    rcv_tos;
-        int                     uc_index;
         int                     mc_index;
         __be32                  mc_addr;
         struct ip_mc_socklist __rcu     *mc_list;
@@ -192,7 +186,7 @@ static inline void __inet_sk_copy_descendant(struct sock *sk_to,
         memcpy(inet_sk(sk_to) + 1, inet_sk(sk_from) + 1,
                sk_from->sk_prot->obj_size - ancestor_size);
 }
-#if !(IS_ENABLED(CONFIG_IPV6))
+#if !(defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE))
 static inline void inet_sk_copy_descendant(struct sock *sk_to,
                                            const struct sock *sk_from)
 {
@@ -246,6 +240,8 @@ static inline __u8 inet_sk_flowi_flags(const struct sock *sk)
 
         if (inet_sk(sk)->transparent || inet_sk(sk)->hdrincl)
                 flags |= FLOWI_FLAG_ANYSRC;
+        if (sk->sk_protocol == IPPROTO_TCP)
+                flags |= FLOWI_FLAG_PRECOW_METRICS;
         return flags;
 }