- updated linux-wistron-nx patch; now builds on i686

[packages/kernel.git] / kernel-zph.patch

diff --git a/kernel-zph.patch b/kernel-zph.patch
index 54fd8dc6e2847950028c565e6b41ba6588dad69b..e61e33bc2d0a9f99ca056c1f766bde576d4608e1 100644 (file)
--- a/kernel-zph.patch
+++ b/kernel-zph.patch
@@ -1,11 +1,11 @@
 diff -Nur linux-2.6.26.3/include/net/inet_sock.h linux-2.6.26.3-zph/include/net/inet_sock.h
 --- linux-2.6.26.3/include/net/inet_sock.h     2008-08-20 21:11:37.000000000 +0300
 +++ linux-2.6.26.3-zph/include/net/inet_sock.h 2008-08-21 16:51:59.000000000 +0300
-@@ -141,6 +141,7 @@
-               __be32                  addr;
-               struct flowi            fl;
-       } cork;
-+      __u16                    zph_tos;        /* ZPH TOS received on connect */ 
+@@ -157,6 +157,7 @@
+       __be32                  mc_addr;
+       struct ip_mc_socklist __rcu     *mc_list;
+       struct inet_cork_full   cork;
++      __u16                   zph_tos;        /* ZPH TOS received on connect */
  };
  
  #define IPCORK_OPT    1       /* ip-options has been held in ipcork.opt */
@@ -27,9 +27,9 @@ diff -Nur linux-2.6.26.3/net/ipv4/tcp_input.c linux-2.6.26.3-zph/net/ipv4/tcp_in
 --- linux-2.6.26.3/net/ipv4/tcp_input.c        2008-08-20 21:11:37.000000000 +0300
 +++ linux-2.6.26.3-zph/net/ipv4/tcp_input.c    2008-08-21 17:06:55.000000000 +0300
 @@ -3900,6 +3900,8 @@
-       struct tcphdr *th = tcp_hdr(skb);
        struct tcp_sock *tp = tcp_sk(sk);
        int eaten = -1;
+       bool fragstolen = false;
 +      struct inet_sock *inet = inet_sk(sk);
 +      struct iphdr *iph = ip_hdr(skb);
  
@@ -48,15 +48,14 @@ diff -Nur linux-2.6.26.3/net/ipv4/tcp_input.c linux-2.6.26.3-zph/net/ipv4/tcp_in
        /*  Queue data for delivery to the user.
         *  Packets in sequence go to the receive queue.
         *  Out of sequence packets to the out_of_order_queue.
-@@ -4915,6 +4923,8 @@
+@@ -4915,5 +4923,7 @@
        struct inet_connection_sock *icsk = inet_csk(sk);
        struct tcp_sock *tp = tcp_sk(sk);
-       struct tcp_cookie_values *cvp = tp->cookie_values;
 +      struct inet_sock *inet = inet_sk(sk);
 +      struct iphdr *iph = ip_hdr(skb);
+       struct tcp_fastopen_cookie foc = { .len = -1 };
        int saved_clamp = tp->rx_opt.mss_clamp;
  
-       tcp_parse_options(skb, &tp->rx_opt, &hash_location, 0);
 @@ -4973,6 +4983,15 @@
  
                TCP_ECN_rcv_synack(tp, th);
@@ -70,6 +69,6 @@ diff -Nur linux-2.6.26.3/net/ipv4/tcp_input.c linux-2.6.26.3-zph/net/ipv4/tcp_in
 +               */
 +              inet->zph_tos = iph->tos;
 +
-               tp->snd_wl1 = TCP_SKB_CB(skb)->seq;
+               tcp_init_wl(tp, TCP_SKB_CB(skb)->seq);
                tcp_ack(sk, skb, FLAG_SLOWPATH);