diff options
| author | Arkadiusz Miśkiewicz | 2010-03-15 21:34:16 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | ca0faea18126eca4444e0e6ac816b958a7c9a7e5 (patch) | |
| tree | 731b6e913cb42e489cc9dd0a03628c25d9d3a540 | |
| parent | 9c74e1d1cbf653989a09a88adb82b62cf3628b15 (diff) | |
| download | kernel-auto/th/kernel-2_6_33_1-1.zip kernel-auto/th/kernel-2_6_33_1-1.tar.gz | |
- up to 2.6.33.1auto/th/kernel-2_6_33_1-1
Changed files:
kernel-imq.patch -> 1.8
kernel.spec -> 1.775
| -rw-r--r-- | kernel-imq.patch | 12 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 7 insertions, 11 deletions
diff --git a/kernel-imq.patch b/kernel-imq.patch index 5a9f670..a48a5ba 100644 --- a/kernel-imq.patch +++ b/kernel-imq.patch @@ -876,20 +876,16 @@ diff -U 5 -Nr linux-2.6.32/include/linux/skbuff.h linux-2.6.32-imq/include/linux #define CHECKSUM_NONE 0 #define CHECKSUM_UNNECESSARY 1 #define CHECKSUM_COMPLETE 2 -@@ -328,10 +331,13 @@ - * layer. Please put your private variables there. If you - * want to keep them across layers you have to do a skb_clone() +@@ -330,6 +330,9 @@ * first. This is owned by whoever has the skb queued ATM. */ - char cb[48]; + char cb[48] __aligned(8); +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) + void *cb_next; +#endif - unsigned int len, - data_len; - __u16 mac_len, - hdr_len; + unsigned long _skb_dst; + #ifdef CONFIG_XFRM @@ -360,10 +366,13 @@ void (*destructor)(struct sk_buff *skb); #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) diff --git a/kernel.spec b/kernel.spec index eedbfde..0e92681 100644 --- a/kernel.spec +++ b/kernel.spec @@ -114,8 +114,8 @@ %endif %define basever 2.6.33 -%define postver %{nil} -%define rel 0.3 +%define postver .1 +%define rel 1 %define _enable_debug_packages 0 @@ -158,7 +158,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2 # Source0-md5: c3883760b18d50e8d78819c54d579b00 %if "%{postver}" != "%{nil}" Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2 -# Source1-md5: 7f615dd3b4a3b19fb86e479996a2deb5 +# Source1-md5: 745fd1355c630e163e40c40d4c9b79f9 %endif Source3: kernel-autoconf.h |