packages: kernel/kernel-toshiba_acpi.patch, kernel/kernel-zph.patch - updat...

[arekm]

Author: arekm                        Date: Thu Feb 25 10:09:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update some patches

---- Files affected:
packages/kernel:
   kernel-toshiba_acpi.patch (1.3 -> 1.4) , kernel-zph.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-toshiba_acpi.patch
diff -u packages/kernel/kernel-toshiba_acpi.patch:1.3 packages/kernel/kernel-toshiba_acpi.patch:1.4
--- packages/kernel/kernel-toshiba_acpi.patch:1.3	Tue Mar 31 14:02:40 2009
+++ packages/kernel/kernel-toshiba_acpi.patch	Thu Feb 25 11:09:47 2010
@@ -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;
  }

================================================================
Index: packages/kernel/kernel-zph.patch
diff -u packages/kernel/kernel-zph.patch:1.2 packages/kernel/kernel-zph.patch:1.3
--- packages/kernel/kernel-zph.patch:1.2	Tue Mar 31 14:02:39 2009
+++ packages/kernel/kernel-zph.patch	Thu Feb 25 11:09:47 2010
@@ -49,14 +49,14 @@
  	 *  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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-toshiba_acpi.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-zph.patch?r1=1.2&r2=1.3&f=u