diff options
| author |   Patrick McHardy <kaber@trash.net> | 2008-04-14 11:15:52 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-04-14 11:15:52 +0200 |
| commit | 5e8fbe2ac8a3f1e34e7004c5750ef59bf9304f82 (patch) | |
| tree | 7a42f4fa1825e215e3ca3f2d3b2f66a865294ce0 /net/netfilter/nf_conntrack_pptp.c | |
| parent | [NETFILTER]: nf_conntrack_tcp: catch invalid state updates over ctnetlink (diff) | |
| download | linux-dev-5e8fbe2ac8a3f1e34e7004c5750ef59bf9304f82.tar.xz linux-dev-5e8fbe2ac8a3f1e34e7004c5750ef59bf9304f82.zip | |
[NETFILTER]: nf_conntrack: add tuplehash l3num/protonum accessors
Add accessors for l3num and protonum and get rid of some overly long
expressions.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_pptp.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_pptp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_pptp.c b/net/netfilter/nf_conntrack_pptp.c index 8fd83470d1b3..4793cc078789 100644 --- a/net/netfilter/nf_conntrack_pptp.c +++ b/net/netfilter/nf_conntrack_pptp.c @@ -209,7 +209,7 @@ static int exp_gre(struct nf_conn *ct, __be16 callid, __be16 peer_callid) /* original direction, PNS->PAC */ dir = IP_CT_DIR_ORIGINAL; nf_ct_expect_init(exp_orig, NF_CT_EXPECT_CLASS_DEFAULT, - ct->tuplehash[dir].tuple.src.l3num, + nf_ct_l3num(ct), &ct->tuplehash[dir].tuple.src.u3, &ct->tuplehash[dir].tuple.dst.u3, IPPROTO_GRE, &peer_callid, &callid); @@ -218,7 +218,7 @@ static int exp_gre(struct nf_conn *ct, __be16 callid, __be16 peer_callid) /* reply direction, PAC->PNS */ dir = IP_CT_DIR_REPLY; nf_ct_expect_init(exp_reply, NF_CT_EXPECT_CLASS_DEFAULT, - ct->tuplehash[dir].tuple.src.l3num, + nf_ct_l3num(ct), &ct->tuplehash[dir].tuple.src.u3, &ct->tuplehash[dir].tuple.dst.u3, IPPROTO_GRE, &callid, &peer_callid); |