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/netfilter | |
| parent | [NETFILTER]: refcount leak of proto when ctnetlink dumping tuple (diff) | |
| download | linux-dev-a2506c04322ca266fe2f9bd7d02a67b1972da611.tar.xz linux-dev-a2506c04322ca266fe2f9bd7d02a67b1972da611.zip | |
[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/netfilter')
| -rw-r--r-- | net/netfilter/nfnetlink.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index 4bc27a6334c1..f8bd7c7e7921 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -128,7 +128,7 @@ void __nfa_fill(struct sk_buff *skb, int attrtype, int attrlen, memset(NFA_DATA(nfa) + attrlen, 0, NFA_ALIGN(size) - size); } -int nfattr_parse(struct nfattr *tb[], int maxattr, struct nfattr *nfa, int len) +void nfattr_parse(struct nfattr *tb[], int maxattr, struct nfattr *nfa, int len) { memset(tb, 0, sizeof(struct nfattr *) * maxattr); @@ -138,8 +138,6 @@ int nfattr_parse(struct nfattr *tb[], int maxattr, struct nfattr *nfa, int len) tb[flavor-1] = nfa; nfa = NFA_NEXT(nfa, len); } - - return 0; } /** |