diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2006-01-05 15:16:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-01-05 15:16:16 -0500 |
commit | d695aa8a1f133359485e15db06d53e15e7309e4d (patch) | |
tree | 913bdfe6b01ee1791ceb455fa28443c87c09f6d3 /net | |
parent | 3e4ead4fe5d0d9fdd7ad6749e6e608d39dd46e8a (diff) |
[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: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/nf_conntrack_core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index a7c7b490cf22..0c5b01d732d8 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
@@ -1129,6 +1129,7 @@ static inline int refresh_timer(struct nf_conntrack_expect *i) | |||
1129 | int nf_conntrack_expect_related(struct nf_conntrack_expect *expect) | 1129 | int nf_conntrack_expect_related(struct nf_conntrack_expect *expect) |
1130 | { | 1130 | { |
1131 | struct nf_conntrack_expect *i; | 1131 | struct nf_conntrack_expect *i; |
1132 | struct nf_conn *master = expect->master; | ||
1132 | int ret; | 1133 | int ret; |
1133 | 1134 | ||
1134 | DEBUGP("nf_conntrack_expect_related %p\n", related_to); | 1135 | DEBUGP("nf_conntrack_expect_related %p\n", related_to); |
@@ -1149,9 +1150,9 @@ int nf_conntrack_expect_related(struct nf_conntrack_expect *expect) | |||
1149 | } | 1150 | } |
1150 | } | 1151 | } |
1151 | /* Will be over limit? */ | 1152 | /* Will be over limit? */ |
1152 | if (expect->master->helper->max_expected && | 1153 | if (master->helper->max_expected && |
1153 | expect->master->expecting >= expect->master->helper->max_expected) | 1154 | master->expecting >= master->helper->max_expected) |
1154 | evict_oldest_expect(expect->master); | 1155 | evict_oldest_expect(master); |
1155 | 1156 | ||
1156 | nf_conntrack_expect_insert(expect); | 1157 | nf_conntrack_expect_insert(expect); |
1157 | nf_conntrack_expect_event(IPEXP_NEW, expect); | 1158 | nf_conntrack_expect_event(IPEXP_NEW, expect); |