diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-20 14:48:23 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-20 14:48:23 +0100 |
| commit | c8396bdc040f4b16e6f6e3f8b81b9fb67a499d9c (patch) | |
| tree | 0704d9f117fb9fefed1b9ec5e680e765d80ff877 /kernel/ip_set_core.c | |
| parent | 13dcc23a375f61d8286072b20067fb31bcc3ad46 (diff) | |
Use annotated types and fix sparse warnings
Annotated types are introduced and sparse warnings fixed.
Two warnings remained in ip_set_core.c but those are false ones.
(Patrick McHardy's review)
Diffstat (limited to 'kernel/ip_set_core.c')
| -rw-r--r-- | kernel/ip_set_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/ip_set_core.c b/kernel/ip_set_core.c index 733d3f3..e449740 100644 --- a/kernel/ip_set_core.c +++ b/kernel/ip_set_core.c @@ -216,7 +216,7 @@ static const struct nla_policy ipaddr_policy[IPSET_ATTR_IPADDR_MAX + 1] = { }; int -ip_set_get_ipaddr4(struct nlattr *attr[], int type, u32 *ipaddr) +ip_set_get_ipaddr4(struct nlattr *attr[], int type, __be32 *ipaddr) { struct nlattr *tb[IPSET_ATTR_IPADDR_MAX+1]; @@ -230,7 +230,7 @@ ip_set_get_ipaddr4(struct nlattr *attr[], int type, u32 *ipaddr) if (!tb[IPSET_ATTR_IPADDR_IPV4]) return -IPSET_ERR_IPADDR_IPV4; - *ipaddr = ip_set_get_n32(tb[IPSET_ATTR_IPADDR_IPV4]); + *ipaddr = nla_get_be32(tb[IPSET_ATTR_IPADDR_IPV4]); return 0; } EXPORT_SYMBOL_GPL(ip_set_get_ipaddr4); @@ -1489,7 +1489,7 @@ static struct nfnetlink_subsystem ip_set_netlink_subsys __read_mostly = { /* Interface to iptables/ip6tables */ static int -ip_set_sockfn_get(struct sock *sk, int optval, void *user, int *len) +ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len) { unsigned *op; void *data; |