Merge tag 'v3.13' into stable-3.14

Linux 3.13

Conflicts:
	security/selinux/hooks.c

Trivial merge issue in selinux_inet_conn_request() likely due to me
including patches that I sent to the stable folks in my next tree
resulting in the patch hitting twice (I think).  Thankfully it was an
easy fix this time, but regardless, lesson learned, I will not do that
again.

1 files changed, 14 insertions, 26 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index d46f2143305c..7820f3a7dd70 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -850,15 +850,15 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
 
         BUG_ON(!skb || !tcp_skb_pcount(skb));
 
-        /* If congestion control is doing timestamping, we must
-         * take such a timestamp before we potentially clone/copy.
-         */
-        if (icsk->icsk_ca_ops->flags & TCP_CONG_RTT_STAMP)
-                __net_timestamp(skb);
-
-        if (likely(clone_it)) {
+        if (clone_it) {
                 const struct sk_buff *fclone = skb + 1;
 
+                /* If congestion control is doing timestamping, we must
+                 * take such a timestamp before we potentially clone/copy.
+                 */
+                if (icsk->icsk_ca_ops->flags & TCP_CONG_RTT_STAMP)
+                        __net_timestamp(skb);
+
                 if (unlikely(skb->fclone == SKB_FCLONE_ORIG &&
                              fclone->fclone == SKB_FCLONE_CLONE))
                         NET_INC_STATS_BH(sock_net(sk),
@@ -1875,8 +1875,12 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,
                  *  - better RTT estimation and ACK scheduling
                  *  - faster recovery
                  *  - high rates
+                 * Alas, some drivers / subsystems require a fair amount
+                 * of queued bytes to ensure line rate.
+                 * One example is wifi aggregation (802.11 AMPDU)
                  */
-                limit = max(skb->truesize, sk->sk_pacing_rate >> 10);
+                limit = max_t(unsigned int, sysctl_tcp_limit_output_bytes,
+                              sk->sk_pacing_rate >> 10);
 
                 if (atomic_read(&sk->sk_wmem_alloc) > limit) {
                         set_bit(TSQ_THROTTLED, &tp->tsq_flags);
@@ -2353,21 +2357,6 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
 
         tcp_retrans_try_collapse(sk, skb, cur_mss);
 
-        /* Some Solaris stacks overoptimize and ignore the FIN on a
-         * retransmit when old data is attached.  So strip it off
-         * since it is cheap to do so and saves bytes on the network.
-         */
-        if (skb->len > 0 &&
-            (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) &&
-            tp->snd_una == (TCP_SKB_CB(skb)->end_seq - 1)) {
-                if (!pskb_trim(skb, 0)) {
-                        /* Reuse, even though it does some unnecessary work */
-                        tcp_init_nondata_skb(skb, TCP_SKB_CB(skb)->end_seq - 1,
-                                             TCP_SKB_CB(skb)->tcp_flags);
-                        skb->ip_summed = CHECKSUM_NONE;
-                }
-        }
-
         /* Make a copy, if the first transmission SKB clone we made
          * is still in somebody's hands, else make a clone.
          */
@@ -2736,8 +2725,8 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
         th->syn = 1;
         th->ack = 1;
         TCP_ECN_make_synack(req, th);
-        th->source = ireq->loc_port;
-        th->dest = ireq->rmt_port;
+        th->source = htons(ireq->ir_num);
+        th->dest = ireq->ir_rmt_port;
         /* Setting of flags are superfluous here for callers (and ECE is
          * not even correctly set)
          */
@@ -3108,7 +3097,6 @@ void tcp_send_window_probe(struct sock *sk)
 {
         if (sk->sk_state == TCP_ESTABLISHED) {
                 tcp_sk(sk)->snd_wl1 = tcp_sk(sk)->rcv_nxt - 1;
-                tcp_sk(sk)->snd_nxt = tcp_sk(sk)->write_seq;
                 tcp_xmit_probe_skb(sk, 0);
         }
 }