merge Linus head tree into my drm tree and fix up conflicts

1 files changed, 12 insertions, 3 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index d6e3d269e906..7114031fdc70 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -190,7 +190,7 @@ void tcp_select_initial_window(int __space, __u32 mss,
         }
 
         /* Set initial window to value enough for senders,
-         * following RFC1414. Senders, not following this RFC,
+         * following RFC2414. Senders, not following this RFC,
          * will be satisfied with 2.
          */
         if (mss > (1<<*rcv_wscale)) {
@@ -435,7 +435,16 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss
         int nsize, old_factor;
         u16 flags;
 
-        BUG_ON(len >= skb->len);
+        if (unlikely(len >= skb->len)) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "TCP: seg_size=%u, mss=%u, seq=%u, "
+                               "end_seq=%u, skb->len=%u.\n", len, mss_now,
+                               TCP_SKB_CB(skb)->seq, TCP_SKB_CB(skb)->end_seq,
+                               skb->len);
+                        WARN_ON(1);
+                }
+                return 0;
+        }
 
         nsize = skb_headlen(skb) - len;
         if (nsize < 0)
@@ -1610,7 +1619,7 @@ void tcp_send_fin(struct sock *sk)
  * was unread data in the receive queue.  This behavior is recommended
  * by draft-ietf-tcpimpl-prob-03.txt section 3.10.  -DaveM
  */
-void tcp_send_active_reset(struct sock *sk, unsigned int __nocast priority)
+void tcp_send_active_reset(struct sock *sk, gfp_t priority)
 {
         struct tcp_sock *tp = tcp_sk(sk);
         struct sk_buff *skb;