diff options
| author | Harald Welte <laforge@netfilter.org> | 2005-11-09 12:59:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-11-09 12:59:13 -0800 |
| commit | a2506c04322ca266fe2f9bd7d02a67b1972da611 (patch) | |
| tree | d7ba0e2ea3e8fc2f6215676c6ca6682b7b847f1b /net/ipv4/netfilter/ip_conntrack_proto_tcp.c | |
| parent | eaae4fa45e0f4cd1da0f00ae93551edb1002b2b9 (diff) | |
[NETFILTER] nfnetlink: nfattr_parse() can never fail, make it void
nfattr_parse (and thus nfattr_parse_nested) always returns success. So we
can make them 'void' and remove all the checking at the caller side.
Based on original patch by Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter/ip_conntrack_proto_tcp.c')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c index d6701cafbcc..6ea4b22ff28 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c @@ -362,8 +362,7 @@ static int nfattr_to_tcp(struct nfattr *cda[], struct ip_conntrack *ct) struct nfattr *attr = cda[CTA_PROTOINFO_TCP-1]; struct nfattr *tb[CTA_PROTOINFO_TCP_MAX]; - if (nfattr_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, attr) < 0) - goto nfattr_failure; + nfattr_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, attr); if (!tb[CTA_PROTOINFO_TCP_STATE-1]) return -EINVAL; @@ -374,9 +373,6 @@ static int nfattr_to_tcp(struct nfattr *cda[], struct ip_conntrack *ct) write_unlock_bh(&tcp_lock); return 0; - -nfattr_failure: - return -1; } #endif |