diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-18 13:08:46 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-18 13:08:46 +0000 |
| commit | c15d708c4975c445a7714b0cf48afd77b2f70df2 (patch) | |
| tree | e83fee55c57e9dceb98b8a9b1d390d70852be874 /target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch | |
| parent | a548c1e7a3388c0ea529f2ac7c2ac39d6f715b0e (diff) | |
upgrade to 2.6.30-rc6, refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15912 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch index 8424a7afc..3bd7a8fbb 100644 --- a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch @@ -1023,7 +1023,7 @@ #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) nf_conntrack_put(skb->nfct); nf_conntrack_put_reasm(skb->nfct_reasm); -@@ -524,6 +610,9 @@ static void __copy_skb_header(struct sk_ +@@ -526,6 +612,9 @@ static void __copy_skb_header(struct sk_ new->sp = secpath_get(old->sp); #endif memcpy(new->cb, old->cb, sizeof(old->cb)); @@ -1033,7 +1033,7 @@ new->csum_start = old->csum_start; new->csum_offset = old->csum_offset; new->local_df = old->local_df; -@@ -2767,6 +2856,13 @@ void __init skb_init(void) +@@ -2769,6 +2858,13 @@ void __init skb_init(void) 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); |