hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[kernel] resync kernel patches 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14949 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Hauke Mehrtens 2009-03-19 13:05:05 +00:00
parent 1b15bd6d80
commit ac06320936
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
View File

@ -664,7 +664,7 @@
#ifdef CONFIG_BRIDGE_NETFILTER #ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge; struct nf_bridge_info *nf_bridge;
#endif #endif
@@ -1813,6 +1817,10 @@ static inline void __nf_copy(struct sk_b @@ -1804,6 +1808,10 @@ static inline void __nf_copy(struct sk_b
dst->nfct_reasm = src->nfct_reasm; dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm); nf_conntrack_get_reasm(src->nfct_reasm);
#endif #endif

4
target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch
View File

@ -95,7 +95,7 @@
* We enter with non-exclusive mmap_sem (to exclude vma changes, * We enter with non-exclusive mmap_sem (to exclude vma changes,
--- a/mm/vmalloc.c --- a/mm/vmalloc.c
+++ b/mm/vmalloc.c +++ b/mm/vmalloc.c
@@ -992,6 +992,7 @@ void unmap_kernel_range(unsigned long ad @@ -1002,6 +1002,7 @@ void unmap_kernel_range(unsigned long ad
vunmap_page_range(addr, end); vunmap_page_range(addr, end);
flush_tlb_kernel_range(addr, end); flush_tlb_kernel_range(addr, end);
} }
@ -103,7 +103,7 @@
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages) int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{ {
@@ -1097,6 +1098,7 @@ struct vm_struct *get_vm_area(unsigned l @@ -1107,6 +1108,7 @@ struct vm_struct *get_vm_area(unsigned l
return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END, return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0)); -1, GFP_KERNEL, __builtin_return_address(0));
} }