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

Commit d695aa8a authored by Jesper Juhl's avatar Jesper Juhl Committed by David S. Miller
Browse files

[NETFILTER]: Decrease number of pointer derefs in nf_conntrack_core.c 



Benefits of the patch:
 - Fewer pointer dereferences should make the code slightly faster.
 - Size of generated code is smaller
 - improved readability

Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e4ead4f

net/netfilter/nf_conntrack_core.c

+4 −3
Original line number Diff line number Diff line
@@ -1129,6 +1129,7 @@ static inline int refresh_timer(struct nf_conntrack_expect *i) 
int nf_conntrack_expect_related(struct nf_conntrack_expect *expect)

{

	struct nf_conntrack_expect *i;

	struct nf_conn *master = expect->master;

	int ret;



	DEBUGP("nf_conntrack_expect_related %p\n", related_to);
@@ -1149,9 +1150,9 @@ int nf_conntrack_expect_related(struct nf_conntrack_expect *expect) 
		}

	}

	/* Will be over limit? */

	if (expect->master->helper->max_expected && 

	    expect->master->expecting >= expect->master->helper->max_expected)

		evict_oldest_expect(expect->master);

	if (master->helper->max_expected && 

	    master->expecting >= master->helper->max_expected)

		evict_oldest_expect(master);



	nf_conntrack_expect_insert(expect);

	nf_conntrack_expect_event(IPEXP_NEW, expect);