diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 15:13:54 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 15:13:54 +0100 |
| commit | 74981bb0217ef397f510277351c369bf443cc591 (patch) | |
| tree | 4c04233d8447432172b45ce2c91bb563b40fd741 /recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch | |
| parent | f45580a1527dccdda100eee7f25f9f2c41af4db8 (diff) | |
| parent | b7e9814253f4b8f61e68d9aa7f518c1404cf417f (diff) | |
| download | openembedded-74981bb0217ef397f510277351c369bf443cc591.tar.gz | |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch')
| -rw-r--r-- | recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch b/recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch new file mode 100644 index 0000000000..b833237c16 --- /dev/null +++ b/recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch @@ -0,0 +1,28 @@ +Index: iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ECN.h +=================================================================== +--- iptables-1.4.6.orig/include/linux/netfilter_ipv4/ipt_ECN.h 2009-12-15 22:05:04.713075521 -0800 ++++ iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ECN.h 2009-12-15 22:08:43.875470318 -0800 +@@ -8,9 +8,6 @@ + */ + #ifndef _IPT_ECN_TARGET_H + #define _IPT_ECN_TARGET_H +-#include <linux/netfilter_ipv4/ipt_DSCP.h> +- +-#define IPT_ECN_IP_MASK (~IPT_DSCP_MASK) + + #define IPT_ECN_OP_SET_IP 0x01 /* set ECN bits of IPv4 header */ + #define IPT_ECN_OP_SET_ECE 0x10 /* set ECE bit of TCP header */ +Index: iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ecn.h +=================================================================== +--- iptables-1.4.6.orig/include/linux/netfilter_ipv4/ipt_ecn.h 2009-12-15 22:09:44.415445160 -0800 ++++ iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ecn.h 2009-12-15 22:09:58.523715835 -0800 +@@ -8,9 +8,6 @@ + */ + #ifndef _IPT_ECN_H + #define _IPT_ECN_H +-#include <linux/netfilter_ipv4/ipt_dscp.h> +- +-#define IPT_ECN_IP_MASK (~IPT_DSCP_MASK) + + #define IPT_ECN_OP_MATCH_IP 0x01 + #define IPT_ECN_OP_MATCH_ECE 0x10 |