diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-06-15 14:11:33 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-06-15 14:11:33 +0000 |
| commit | d39379296cb58c30709210690b586b108b18b872 (patch) | |
| tree | 037b1986c04b0b1af74fcbb7f78386aa6cd5131e /target/linux | |
| parent | 14913ab8b0a6213fbf1fcbeab614e44321ad5aee (diff) | |
| download | upstream-d39379296cb58c30709210690b586b108b18b872.tar.gz upstream-d39379296cb58c30709210690b586b108b18b872.tar.bz2 upstream-d39379296cb58c30709210690b586b108b18b872.zip | |
backport upstream Kernel commit 1ed2f73d90fb49bcf5704aee7e9084adb882bfc5 (netfilter: IPv6: fix DSCP mangle code)
SVN-Revision: 27179
Diffstat (limited to 'target/linux')
6 files changed, 156 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.30/130-netfilter_dscp_ipv6_mangle.patch b/target/linux/generic/patches-2.6.30/130-netfilter_dscp_ipv6_mangle.patch new file mode 100644 index 0000000000..7cf001acb9 --- /dev/null +++ b/target/linux/generic/patches-2.6.30/130-netfilter_dscp_ipv6_mangle.patch @@ -0,0 +1,26 @@ +From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Date: Tue, 10 May 2011 08:00:21 +0000 (+0200) +Subject: netfilter: IPv6: fix DSCP mangle code +X-Git-Tag: v2.6.39~15^2~13^2~1 +X-Git-Url: http://git390.marist.edu/cgi-bin/gitweb.cgi?p=linux-2.6.git;a=commitdiff_plain;h=1ed2f73d90fb49bcf5704aee7e9084adb882bfc5 + +netfilter: IPv6: fix DSCP mangle code + +The mask indicates the bits one wants to zero out, so it needs to be +inverted before applying to the original TOS field. + +Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + +--- a/net/netfilter/xt_DSCP.c ++++ b/net/netfilter/xt_DSCP.c +@@ -135,7 +135,7 @@ tos_tg6(struct sk_buff *skb, const struc + u_int8_t orig, nv; + + orig = ipv6_get_dsfield(iph); +- nv = (orig & info->tos_mask) ^ info->tos_value; ++ nv = (orig & ~info->tos_mask) ^ info->tos_value; + + if (orig != nv) { + if (!skb_make_writable(skb, sizeof(struct iphdr))) diff --git a/target/linux/generic/patches-2.6.31/130-netfilter_dscp_ipv6_mangle.patch b/target/linux/generic/patches-2.6.31/130-netfilter_dscp_ipv6_mangle.patch new file mode 100644 index 0000000000..7cf001acb9 --- /dev/null +++ b/target/linux/generic/patches-2.6.31/130-netfilter_dscp_ipv6_mangle.patch @@ -0,0 +1,26 @@ +From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Date: Tue, 10 May 2011 08:00:21 +0000 (+0200) +Subject: netfilter: IPv6: fix DSCP mangle code +X-Git-Tag: v2.6.39~15^2~13^2~1 +X-Git-Url: http://git390.marist.edu/cgi-bin/gitweb.cgi?p=linux-2.6.git;a=commitdiff_plain;h=1ed2f73d90fb49bcf5704aee7e9084adb882bfc5 + +netfilter: IPv6: fix DSCP mangle code + +The mask indicates the bits one wants to zero out, so it needs to be +inverted before applying to the original TOS field. + +Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + +--- a/net/netfilter/xt_DSCP.c ++++ b/net/netfilter/xt_DSCP.c +@@ -135,7 +135,7 @@ tos_tg6(struct sk_buff *skb, const struc + u_int8_t orig, nv; + + orig = ipv6_get_dsfield(iph); +- nv = (orig & info->tos_mask) ^ info->tos_value; ++ nv = (orig & ~info->tos_mask) ^ info->tos_value; + + if (orig != nv) { + if (!skb_make_writable(skb, sizeof(struct iphdr))) diff --git a/target/linux/generic/patches-2.6.32/130-netfilter_dscp_ipv6_mangle.patch b/target/linux/generic/patches-2.6.32/130-netfilter_dscp_ipv6_mangle.patch new file mode 100644 index 0000000000..670fd220ac --- /dev/null +++ b/target/linux/generic/patches-2.6.32/130-netfilter_dscp_ipv6_mangle.patch @@ -0,0 +1,26 @@ +From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Date: Tue, 10 May 2011 08:00:21 +0000 (+0200) +Subject: netfilter: IPv6: fix DSCP mangle code +X-Git-Tag: v2.6.39~15^2~13^2~1 +X-Git-Url: http://git390.marist.edu/cgi-bin/gitweb.cgi?p=linux-2.6.git;a=commitdiff_plain;h=1ed2f73d90fb49bcf5704aee7e9084adb882bfc5 + +netfilter: IPv6: fix DSCP mangle code + +The mask indicates the bits one wants to zero out, so it needs to be +inverted before applying to the original TOS field. + +Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + +--- a/net/netfilter/xt_DSCP.c ++++ b/net/netfilter/xt_DSCP.c +@@ -99,7 +99,7 @@ tos_tg6(struct sk_buff *skb, const struc + u_int8_t orig, nv; + + orig = ipv6_get_dsfield(iph); +- nv = (orig & info->tos_mask) ^ info->tos_value; ++ nv = (orig & ~info->tos_mask) ^ info->tos_value; + + if (orig != nv) { + if (!skb_make_writable(skb, sizeof(struct iphdr))) diff --git a/target/linux/generic/patches-2.6.36/130-netfilter_dscp_ipv6_mangle.patch b/target/linux/generic/patches-2.6.36/130-netfilter_dscp_ipv6_mangle.patch new file mode 100644 index 0000000000..670fd220ac --- /dev/null +++ b/target/linux/generic/patches-2.6.36/130-netfilter_dscp_ipv6_mangle.patch @@ -0,0 +1,26 @@ +From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Date: Tue, 10 May 2011 08:00:21 +0000 (+0200) +Subject: netfilter: IPv6: fix DSCP mangle code +X-Git-Tag: v2.6.39~15^2~13^2~1 +X-Git-Url: http://git390.marist.edu/cgi-bin/gitweb.cgi?p=linux-2.6.git;a=commitdiff_plain;h=1ed2f73d90fb49bcf5704aee7e9084adb882bfc5 + +netfilter: IPv6: fix DSCP mangle code + +The mask indicates the bits one wants to zero out, so it needs to be +inverted before applying to the original TOS field. + +Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + +--- a/net/netfilter/xt_DSCP.c ++++ b/net/netfilter/xt_DSCP.c +@@ -99,7 +99,7 @@ tos_tg6(struct sk_buff *skb, const struc + u_int8_t orig, nv; + + orig = ipv6_get_dsfield(iph); +- nv = (orig & info->tos_mask) ^ info->tos_value; ++ nv = (orig & ~info->tos_mask) ^ info->tos_value; + + if (orig != nv) { + if (!skb_make_writable(skb, sizeof(struct iphdr))) diff --git a/target/linux/generic/patches-2.6.37/606-netfilter_dscp_ipv6_mangle.patch b/target/linux/generic/patches-2.6.37/606-netfilter_dscp_ipv6_mangle.patch new file mode 100644 index 0000000000..670fd220ac --- /dev/null +++ b/target/linux/generic/patches-2.6.37/606-netfilter_dscp_ipv6_mangle.patch @@ -0,0 +1,26 @@ +From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Date: Tue, 10 May 2011 08:00:21 +0000 (+0200) +Subject: netfilter: IPv6: fix DSCP mangle code +X-Git-Tag: v2.6.39~15^2~13^2~1 +X-Git-Url: http://git390.marist.edu/cgi-bin/gitweb.cgi?p=linux-2.6.git;a=commitdiff_plain;h=1ed2f73d90fb49bcf5704aee7e9084adb882bfc5 + +netfilter: IPv6: fix DSCP mangle code + +The mask indicates the bits one wants to zero out, so it needs to be +inverted before applying to the original TOS field. + +Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + +--- a/net/netfilter/xt_DSCP.c ++++ b/net/netfilter/xt_DSCP.c +@@ -99,7 +99,7 @@ tos_tg6(struct sk_buff *skb, const struc + u_int8_t orig, nv; + + orig = ipv6_get_dsfield(iph); +- nv = (orig & info->tos_mask) ^ info->tos_value; ++ nv = (orig & ~info->tos_mask) ^ info->tos_value; + + if (orig != nv) { + if (!skb_make_writable(skb, sizeof(struct iphdr))) diff --git a/target/linux/generic/patches-2.6.38/606-netfilter_dscp_ipv6_mangle.patch b/target/linux/generic/patches-2.6.38/606-netfilter_dscp_ipv6_mangle.patch new file mode 100644 index 0000000000..670fd220ac --- /dev/null +++ b/target/linux/generic/patches-2.6.38/606-netfilter_dscp_ipv6_mangle.patch @@ -0,0 +1,26 @@ +From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Date: Tue, 10 May 2011 08:00:21 +0000 (+0200) +Subject: netfilter: IPv6: fix DSCP mangle code +X-Git-Tag: v2.6.39~15^2~13^2~1 +X-Git-Url: http://git390.marist.edu/cgi-bin/gitweb.cgi?p=linux-2.6.git;a=commitdiff_plain;h=1ed2f73d90fb49bcf5704aee7e9084adb882bfc5 + +netfilter: IPv6: fix DSCP mangle code + +The mask indicates the bits one wants to zero out, so it needs to be +inverted before applying to the original TOS field. + +Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + +--- a/net/netfilter/xt_DSCP.c ++++ b/net/netfilter/xt_DSCP.c +@@ -99,7 +99,7 @@ tos_tg6(struct sk_buff *skb, const struc + u_int8_t orig, nv; + + orig = ipv6_get_dsfield(iph); +- nv = (orig & info->tos_mask) ^ info->tos_value; ++ nv = (orig & ~info->tos_mask) ^ info->tos_value; + + if (orig != nv) { + if (!skb_make_writable(skb, sizeof(struct iphdr))) |