Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42c344a3 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Pablo Neira Ayuso
Browse files

netfilter: xtables: collapse conditions in xt_ecn 



One simplification of an if clause.

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent af0d29cd

net/netfilter/xt_ecn.c

+6 −9
Original line number Diff line number Diff line
@@ -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))

	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))

	if (info->operation & (XT_ECN_OP_MATCH_ECE | XT_ECN_OP_MATCH_CWR) &&

	    !match_tcp(skb, par))

		return false;

	}



	return true;

}