- update some patches

Changed files:
    kernel-toshiba_acpi.patch -> 1.4
    kernel-zph.patch -> 1.3

diff --git a/kernel-toshiba_acpi.patch b/kernel-toshiba_acpi.patch
index 26a4790e3471ee8feefd9f4688e3cd20ae45d8d9..b7546f9dd7ad6ca972f8105a542ff633e50746cc 100644 (file)
--- a/kernel-toshiba_acpi.patch
+++ b/kernel-toshiba_acpi.patch
@@ -28,17 +28,16 @@
  #define PROC_INTERFACE_VERSION        1
  
  #include <linux/kernel.h>
-@@ -41,6 +55,10 @@
- #include <linux/init.h>
- #include <linux/types.h>
- #include <linux/proc_fs.h>
-+#include <linux/seq_file.h>
+@@ -60,6 +60,9 @@
+ #include <linux/backlight.h>
+ #include <linux/platform_device.h>
+ #include <linux/rfkill.h>
 +#include <linux/miscdevice.h>
 +#include <linux/toshiba.h>
 +#include <asm/io.h>
- #include <linux/backlight.h>
  
  #include <asm/uaccess.h>
+ 
 @@ -497,6 +515,191 @@
        return p;
  }

diff --git a/kernel-zph.patch b/kernel-zph.patch
index b352061508224f46ab9ec5b467ec5b1bfd3e0863..54fd8dc6e2847950028c565e6b41ba6588dad69b 100644 (file)
--- a/kernel-zph.patch
+++ b/kernel-zph.patch
@@ -49,14 +49,14 @@ diff -Nur linux-2.6.26.3/net/ipv4/tcp_input.c linux-2.6.26.3-zph/net/ipv4/tcp_in
         *  Packets in sequence go to the receive queue.
         *  Out of sequence packets to the out_of_order_queue.
 @@ -4915,6 +4923,8 @@
- {
-       struct tcp_sock *tp = tcp_sk(sk);
        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);
        int saved_clamp = tp->rx_opt.mss_clamp;
  
-       tcp_parse_options(skb, &tp->rx_opt, 0);
+       tcp_parse_options(skb, &tp->rx_opt, &hash_location, 0);
 @@ -4973,6 +4983,15 @@
  
                TCP_ECN_rcv_synack(tp, th);