diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-04-12 19:39:20 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-12 19:39:20 +0000 |
| commit | 62100399e394f9d4aae71a5e409c91137333797b (patch) | |
| tree | b39442bafc4ffd370397f3d5caeb7fe639cb9a86 /target/linux/generic/patches-2.6.39/102-netfilter_layer7_match.patch | |
| parent | 30e3b0f535b6040f543bad3aa599234249ae83f1 (diff) | |
| download | master-187ad058-62100399e394f9d4aae71a5e409c91137333797b.tar.gz master-187ad058-62100399e394f9d4aae71a5e409c91137333797b.tar.bz2 master-187ad058-62100399e394f9d4aae71a5e409c91137333797b.zip | |
generic: Add support for 2.6.39
Add support for 2.6.39 based on rc3. Runtime tested on bcm63xx.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26615 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.39/102-netfilter_layer7_match.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.39/102-netfilter_layer7_match.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.39/102-netfilter_layer7_match.patch b/target/linux/generic/patches-2.6.39/102-netfilter_layer7_match.patch new file mode 100644 index 0000000000..b2e48c824f --- /dev/null +++ b/target/linux/generic/patches-2.6.39/102-netfilter_layer7_match.patch @@ -0,0 +1,51 @@ +--- a/net/netfilter/xt_layer7.c ++++ b/net/netfilter/xt_layer7.c +@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file + } + + static bool +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) ++match(const struct sk_buff *skbin, struct xt_action_param *par) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) + match(const struct sk_buff *skbin, const struct xt_match_param *par) + #else + match(const struct sk_buff *skbin, +@@ -597,14 +599,19 @@ match(const struct sk_buff *skbin, + } + + // load nf_conntrack_ipv4 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) ++static int ++#else ++static bool ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) +-static bool check(const struct xt_mtchk_param *par) ++check(const struct xt_mtchk_param *par) + { + if (nf_ct_l3proto_try_module_get(par->match->family) < 0) { + printk(KERN_WARNING "can't load conntrack support for " + "proto=%d\n", par->match->family); + #else +-static bool check(const char *tablename, const void *inf, ++check(const char *tablename, const void *inf, + const struct xt_match *match, void *matchinfo, + unsigned int hook_mask) + { +@@ -612,9 +619,15 @@ static bool check(const char *tablename, + printk(KERN_WARNING "can't load conntrack support for " + "proto=%d\n", match->family); + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) ++ return -EINVAL; ++ } ++ return 0; ++#else + return 0; + } + return 1; ++#endif + } + + |