5 files changed, 81 insertions, 83 deletions

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 4e73e5708e70..21515d4c49eb 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -575,7 +575,7 @@ static int esp_init_state(struct xfrm_state *x)
                               crypto_aead_ivsize(aead);
         if (x->props.mode == XFRM_MODE_TUNNEL)
                 x->props.header_len += sizeof(struct iphdr);
-        else if (x->props.mode == XFRM_MODE_BEET)
+        else if (x->props.mode == XFRM_MODE_BEET && x->sel.family != AF_INET6)
                 x->props.header_len += IPV4_BEET_PHMAXLEN;
         if (x->encap) {
                 struct xfrm_encap_tmpl *encap = x->encap;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 1bfa078ddbd0..16fc6f454a31 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1509,14 +1509,14 @@ unsigned short ip_rt_frag_needed(struct net *net, struct iphdr *iph,
 
                                         /* BSD 4.2 compatibility hack :-( */
                                         if (mtu == 0 &&
-                                            old_mtu >= dst_metric(&rth->u.dst, RTAX_MTU) &&
+                                            old_mtu >= dst_mtu(&rth->u.dst) &&
                                             old_mtu >= 68 + (iph->ihl << 2))
                                                 old_mtu -= iph->ihl << 2;
 
                                         mtu = guess_mtu(old_mtu);
                                 }
-                                if (mtu <= dst_metric(&rth->u.dst, RTAX_MTU)) {
-                                        if (mtu < dst_metric(&rth->u.dst, RTAX_MTU)) {
+                                if (mtu <= dst_mtu(&rth->u.dst)) {
+                                        if (mtu < dst_mtu(&rth->u.dst)) {
                                                 dst_confirm(&rth->u.dst);
                                                 if (mtu < ip_rt_min_pmtu) {
                                                         mtu = ip_rt_min_pmtu;
@@ -1538,7 +1538,7 @@ unsigned short ip_rt_frag_needed(struct net *net, struct iphdr *iph,
 
 static void ip_rt_update_pmtu(struct dst_entry *dst, u32 mtu)
 {
-        if (dst_metric(dst, RTAX_MTU) > mtu && mtu >= 68 &&
+        if (dst_mtu(dst) > mtu && mtu >= 68 &&
             !(dst_metric_locked(dst, RTAX_MTU))) {
                 if (mtu < ip_rt_min_pmtu) {
                         mtu = ip_rt_min_pmtu;
@@ -1667,7 +1667,7 @@ static void rt_set_nexthop(struct rtable *rt, struct fib_result *res, u32 itag)
 
         if (dst_metric(&rt->u.dst, RTAX_HOPLIMIT) == 0)
                 rt->u.dst.metrics[RTAX_HOPLIMIT-1] = sysctl_ip_default_ttl;
-        if (dst_metric(&rt->u.dst, RTAX_MTU) > IP_MAX_MTU)
+        if (dst_mtu(&rt->u.dst) > IP_MAX_MTU)
                 rt->u.dst.metrics[RTAX_MTU-1] = IP_MAX_MTU;
         if (dst_metric(&rt->u.dst, RTAX_ADVMSS) == 0)
                 rt->u.dst.metrics[RTAX_ADVMSS-1] = max_t(unsigned int, rt->u.dst.dev->mtu - 40,
@@ -3223,9 +3223,7 @@ int __init ip_rt_init(void)
  */
 void __init ip_static_sysctl_init(void)
 {
-#ifdef CONFIG_SYSCTL
         register_sysctl_paths(ipv4_route_path, ipv4_route_table);
-#endif
 }
 #endif
 
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 91a8cfddf1c4..44c1e934824b 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -687,14 +687,14 @@ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
         inet_twsk_put(tw);
 }
 
-static void tcp_v4_reqsk_send_ack(struct sk_buff *skb,
+static void tcp_v4_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
                                   struct request_sock *req)
 {
         tcp_v4_send_ack(skb, tcp_rsk(req)->snt_isn + 1,
                         tcp_rsk(req)->rcv_isn + 1, req->rcv_wnd,
                         req->ts_recent,
                         0,
-                        tcp_v4_md5_do_lookup(skb->sk, ip_hdr(skb)->daddr));
+                        tcp_v4_md5_do_lookup(sk, ip_hdr(skb)->daddr));
 }
 
 /*
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 204c42162660..f976fc57892c 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -609,7 +609,7 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb,
                                           tcp_rsk(req)->rcv_isn + 1, tcp_rsk(req)->rcv_isn + 1 + req->rcv_wnd)) {
                 /* Out of window: send ACK and drop. */
                 if (!(flg & TCP_FLAG_RST))
-                        req->rsk_ops->send_ack(skb, req);
+                        req->rsk_ops->send_ack(sk, skb, req);
                 if (paws_reject)
                         NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_PAWSESTABREJECTED);
                 return NULL;
@@ -618,89 +618,87 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb,
         /* In sequence, PAWS is OK. */
 
         if (tmp_opt.saw_tstamp && !after(TCP_SKB_CB(skb)->seq, tcp_rsk(req)->rcv_isn + 1))
-                        req->ts_recent = tmp_opt.rcv_tsval;
+                req->ts_recent = tmp_opt.rcv_tsval;
 
-                if (TCP_SKB_CB(skb)->seq == tcp_rsk(req)->rcv_isn) {
-                        /* Truncate SYN, it is out of window starting
-                           at tcp_rsk(req)->rcv_isn + 1. */
-                        flg &= ~TCP_FLAG_SYN;
-                }
+        if (TCP_SKB_CB(skb)->seq == tcp_rsk(req)->rcv_isn) {
+                /* Truncate SYN, it is out of window starting
+                   at tcp_rsk(req)->rcv_isn + 1. */
+                flg &= ~TCP_FLAG_SYN;
+        }
 
-                /* RFC793: "second check the RST bit" and
-                 *         "fourth, check the SYN bit"
-                 */
-                if (flg & (TCP_FLAG_RST|TCP_FLAG_SYN)) {
-                        TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
-                        goto embryonic_reset;
-                }
+        /* RFC793: "second check the RST bit" and
+         *         "fourth, check the SYN bit"
+         */
+        if (flg & (TCP_FLAG_RST|TCP_FLAG_SYN)) {
+                TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
+                goto embryonic_reset;
+        }
 
-                /* ACK sequence verified above, just make sure ACK is
-                 * set.  If ACK not set, just silently drop the packet.
-                 */
-                if (!(flg & TCP_FLAG_ACK))
-                        return NULL;
-
-                /* If TCP_DEFER_ACCEPT is set, drop bare ACK. */
-                if (inet_csk(sk)->icsk_accept_queue.rskq_defer_accept &&
-                    TCP_SKB_CB(skb)->end_seq == tcp_rsk(req)->rcv_isn + 1) {
-                        inet_rsk(req)->acked = 1;
-                        return NULL;
-                }
+        /* ACK sequence verified above, just make sure ACK is
+         * set.  If ACK not set, just silently drop the packet.
+         */
+        if (!(flg & TCP_FLAG_ACK))
+                return NULL;
 
-                /* OK, ACK is valid, create big socket and
-                 * feed this segment to it. It will repeat all
-                 * the tests. THIS SEGMENT MUST MOVE SOCKET TO
-                 * ESTABLISHED STATE. If it will be dropped after
-                 * socket is created, wait for troubles.
-                 */
-                child = inet_csk(sk)->icsk_af_ops->syn_recv_sock(sk, skb,
-                                                                 req, NULL);
-                if (child == NULL)
-                        goto listen_overflow;
+        /* If TCP_DEFER_ACCEPT is set, drop bare ACK. */
+        if (inet_csk(sk)->icsk_accept_queue.rskq_defer_accept &&
+            TCP_SKB_CB(skb)->end_seq == tcp_rsk(req)->rcv_isn + 1) {
+                inet_rsk(req)->acked = 1;
+                return NULL;
+        }
+
+        /* OK, ACK is valid, create big socket and
+         * feed this segment to it. It will repeat all
+         * the tests. THIS SEGMENT MUST MOVE SOCKET TO
+         * ESTABLISHED STATE. If it will be dropped after
+         * socket is created, wait for troubles.
+         */
+        child = inet_csk(sk)->icsk_af_ops->syn_recv_sock(sk, skb, req, NULL);
+        if (child == NULL)
+                goto listen_overflow;
 #ifdef CONFIG_TCP_MD5SIG
-                else {
-                        /* Copy over the MD5 key from the original socket */
-                        struct tcp_md5sig_key *key;
-                        struct tcp_sock *tp = tcp_sk(sk);
-                        key = tp->af_specific->md5_lookup(sk, child);
-                        if (key != NULL) {
-                                /*
-                                 * We're using one, so create a matching key on the
-                                 * newsk structure. If we fail to get memory then we
-                                 * end up not copying the key across. Shucks.
-                                 */
-                                char *newkey = kmemdup(key->key, key->keylen,
-                                                       GFP_ATOMIC);
-                                if (newkey) {
-                                        if (!tcp_alloc_md5sig_pool())
-                                                BUG();
-                                        tp->af_specific->md5_add(child, child,
-                                                                 newkey,
-                                                                 key->keylen);
-                                }
+        else {
+                /* Copy over the MD5 key from the original socket */
+                struct tcp_md5sig_key *key;
+                struct tcp_sock *tp = tcp_sk(sk);
+                key = tp->af_specific->md5_lookup(sk, child);
+                if (key != NULL) {
+                        /*
+                         * We're using one, so create a matching key on the
+                         * newsk structure. If we fail to get memory then we
+                         * end up not copying the key across. Shucks.
+                         */
+                        char *newkey = kmemdup(key->key, key->keylen,
+                                               GFP_ATOMIC);
+                        if (newkey) {
+                                if (!tcp_alloc_md5sig_pool())
+                                        BUG();
+                                tp->af_specific->md5_add(child, child, newkey,
+                                                         key->keylen);
                         }
                 }
+        }
 #endif
 
-                inet_csk_reqsk_queue_unlink(sk, req, prev);
-                inet_csk_reqsk_queue_removed(sk, req);
+        inet_csk_reqsk_queue_unlink(sk, req, prev);
+        inet_csk_reqsk_queue_removed(sk, req);
 
-                inet_csk_reqsk_queue_add(sk, req, child);
-                return child;
+        inet_csk_reqsk_queue_add(sk, req, child);
+        return child;
 
-        listen_overflow:
-                if (!sysctl_tcp_abort_on_overflow) {
-                        inet_rsk(req)->acked = 1;
-                        return NULL;
-                }
+listen_overflow:
+        if (!sysctl_tcp_abort_on_overflow) {
+                inet_rsk(req)->acked = 1;
+                return NULL;
+        }
 
-        embryonic_reset:
-                NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
-                if (!(flg & TCP_FLAG_RST))
-                        req->rsk_ops->send_reset(sk, skb);
+embryonic_reset:
+        NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
+        if (!(flg & TCP_FLAG_RST))
+                req->rsk_ops->send_reset(sk, skb);
 
-                inet_csk_reqsk_queue_drop(sk, req, prev);
-                return NULL;
+        inet_csk_reqsk_queue_drop(sk, req, prev);
+        return NULL;
 }
 
 /*
diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c
index 9c798abce736..63418185f524 100644
--- a/net/ipv4/xfrm4_mode_beet.c
+++ b/net/ipv4/xfrm4_mode_beet.c
@@ -47,8 +47,10 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb)
         if (unlikely(optlen))
                 hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4);
 
-        skb_set_network_header(skb, IPV4_BEET_PHMAXLEN - x->props.header_len -
-                                    hdrlen);
+        skb_set_network_header(skb, -x->props.header_len -
+                                    hdrlen + (XFRM_MODE_SKB_CB(skb)->ihl - sizeof(*top_iph)));
+        if (x->sel.family != AF_INET6)
+                skb->network_header += IPV4_BEET_PHMAXLEN;
         skb->mac_header = skb->network_header +
                           offsetof(struct iphdr, protocol);
         skb->transport_header = skb->network_header + sizeof(*top_iph);