diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2008-01-31 04:08:10 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-31 19:27:46 -0800 |
commit | 2f0d2f10391e190f940da70cbdc8a61e4dad98eb (patch) | |
tree | d732ec9ecf934264525254873c5cc5aa18afce15 /net/netfilter/nf_conntrack_proto_tcp.c | |
parent | 4e26fe2681e9e3a4a43daab70c9facba3310755b (diff) | |
download | kernel_samsung_smdk4412-2f0d2f10391e190f940da70cbdc8a61e4dad98eb.zip kernel_samsung_smdk4412-2f0d2f10391e190f940da70cbdc8a61e4dad98eb.tar.gz kernel_samsung_smdk4412-2f0d2f10391e190f940da70cbdc8a61e4dad98eb.tar.bz2 |
[NETFILTER]: conntrack: get rid of sparse warnings
Teach sparse about locking here, and fix signed/unsigned warnings.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_tcp.c')
-rw-r--r-- | net/netfilter/nf_conntrack_proto_tcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 64c9b91..8e22075 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -1098,16 +1098,16 @@ static const struct nla_policy tcp_nla_policy[CTA_PROTOINFO_TCP_MAX+1] = { static int nlattr_to_tcp(struct nlattr *cda[], struct nf_conn *ct) { - struct nlattr *attr = cda[CTA_PROTOINFO_TCP]; + struct nlattr *pattr = cda[CTA_PROTOINFO_TCP]; struct nlattr *tb[CTA_PROTOINFO_TCP_MAX+1]; int err; /* updates could not contain anything about the private * protocol info, in that case skip the parsing */ - if (!attr) + if (!pattr) return 0; - err = nla_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, attr, tcp_nla_policy); + err = nla_parse_nested(tb, CTA_PROTOINFO_TCP_MAX, pattr, tcp_nla_policy); if (err < 0) return err; |