Commit 5547cd0a authored Jul 21, 2008 by Patrick McHardy Committed by David S. Miller Jul 21, 2008

netfilter: nf_conntrack_sctp: fix sparse warnings

Introduced by a258860e (netfilter: ctnetlink: add full support for SCTP to ctnetlink):

net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: cast from restricted type
net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: incorrect type in argument 1 (different base types)
net/netfilter/nf_conntrack_proto_sctp.c:483:2: expected unsigned int [unsigned] [usertype] x
net/netfilter/nf_conntrack_proto_sctp.c:483:2: got restricted unsigned int const <noident>
net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: cast from restricted type
net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: cast from restricted type
net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: cast from restricted type
net/netfilter/nf_conntrack_proto_sctp.c:483:2: warning: cast from restricted type
net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: cast from restricted type
net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: incorrect type in argument 1 (different base types)
net/netfilter/nf_conntrack_proto_sctp.c:487:2: expected unsigned int [unsigned] [usertype] x
net/netfilter/nf_conntrack_proto_sctp.c:487:2: got restricted unsigned int const <noident>
net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: cast from restricted type
net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: cast from restricted type
net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: cast from restricted type
net/netfilter/nf_conntrack_proto_sctp.c:487:2: warning: cast from restricted type
net/netfilter/nf_conntrack_proto_sctp.c:532:42: warning: incorrect type in assignment (different base types)
net/netfilter/nf_conntrack_proto_sctp.c:532:42: expected restricted unsigned int <noident>
net/netfilter/nf_conntrack_proto_sctp.c:532:42: got unsigned int
net/netfilter/nf_conntrack_proto_sctp.c:534:39: warning: incorrect type in assignment (different base types)
net/netfilter/nf_conntrack_proto_sctp.c:534:39: expected restricted unsigned int <noident>
net/netfilter/nf_conntrack_proto_sctp.c:534:39: got unsigned int

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c71529e4

net/netfilter/nf_conntrack_proto_sctp.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -482,11 +482,11 @@ static int sctp_to_nlattr(struct sk_buff skb, struct nlattr nla,

		NLA_PUT_BE32(skb,
		CTA_PROTOINFO_SCTP_VTAG_ORIGINAL,
		htonl(ct->proto.sctp.vtag[IP_CT_DIR_ORIGINAL]));
		ct->proto.sctp.vtag[IP_CT_DIR_ORIGINAL]);

		NLA_PUT_BE32(skb,
		CTA_PROTOINFO_SCTP_VTAG_REPLY,
		htonl(ct->proto.sctp.vtag[IP_CT_DIR_REPLY]));
		ct->proto.sctp.vtag[IP_CT_DIR_REPLY]);

		read_unlock_bh(&sctp_lock);

		@@ -530,9 +530,9 @@ static int nlattr_to_sctp(struct nlattr cda[], struct nf_conn ct)
		write_lock_bh(&sctp_lock);
		ct->proto.sctp.state = nla_get_u8(tb[CTA_PROTOINFO_SCTP_STATE]);
		ct->proto.sctp.vtag[IP_CT_DIR_ORIGINAL] =
		ntohl(nla_get_be32(tb[CTA_PROTOINFO_SCTP_VTAG_ORIGINAL]));
		nla_get_be32(tb[CTA_PROTOINFO_SCTP_VTAG_ORIGINAL]);
		ct->proto.sctp.vtag[IP_CT_DIR_REPLY] =
		ntohl(nla_get_be32(tb[CTA_PROTOINFO_SCTP_VTAG_REPLY]));
		nla_get_be32(tb[CTA_PROTOINFO_SCTP_VTAG_REPLY]);
		write_unlock_bh(&sctp_lock);

		return 0;