From 9dd94265a5734638a97da9ded705e2de6503cb71 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Jun 2011 22:16:50 +0200 Subject: [PATCH] --- yaml --- r: 279113 b: refs/heads/master c: 42c344a3bc6bb2eb4c0bef98d24d53adda255154 h: refs/heads/master i: 279111: a74c614b6f254483af2aedadf287a1962bdd9e97 v: v3 --- [refs] | 2 +- trunk/net/netfilter/xt_ecn.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 04b8070abacb..025a147073ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af0d29cd2a732f70882e6122b9f9df8b0d84515e +refs/heads/master: 42c344a3bc6bb2eb4c0bef98d24d53adda255154 diff --git a/trunk/net/netfilter/xt_ecn.c b/trunk/net/netfilter/xt_ecn.c index 6ccc35d6cb11..3c831a8efebc 100644 --- a/trunk/net/netfilter/xt_ecn.c +++ b/trunk/net/netfilter/xt_ecn.c @@ -37,9 +37,8 @@ static bool match_tcp(const struct sk_buff *skb, struct xt_action_param *par) * be good citizens. */ th = skb_header_pointer(skb, par->thoff, sizeof(_tcph), &_tcph); - if (th == NULL) { + if (th == NULL) return false; - } if (einfo->operation & XT_ECN_OP_MATCH_ECE) { if (einfo->invert & XT_ECN_OP_MATCH_ECE) { @@ -75,14 +74,12 @@ static bool ecn_mt4(const struct sk_buff *skb, struct xt_action_param *par) { const struct xt_ecn_info *info = par->matchinfo; - if (info->operation & XT_ECN_OP_MATCH_IP) - if (!match_ip(skb, info)) - return false; + if (info->operation & XT_ECN_OP_MATCH_IP && !match_ip(skb, info)) + return false; - if (info->operation & (XT_ECN_OP_MATCH_ECE | XT_ECN_OP_MATCH_CWR)) { - if (!match_tcp(skb, par)) - return false; - } + if (info->operation & (XT_ECN_OP_MATCH_ECE | XT_ECN_OP_MATCH_CWR) && + !match_tcp(skb, par)) + return false; return true; }