diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2017-03-23 22:10:40 +0100 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2017-03-23 22:10:40 +0100 |
| commit | e6b86693d5fea73eaf818ddf4c73b988c5c0140a (patch) | |
| tree | 3a52c0651fea5804e278f902f44df26ff7399d95 | |
| parent | f82d6f0643ba737bf51c6f661a7acd81c4293fae (diff) | |
Fix sparse warnings
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_core.c | 2 | ||||
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c index f497e99..3bb832d 100644 --- a/kernel/net/netfilter/ipset/ip_set_core.c +++ b/kernel/net/netfilter/ipset/ip_set_core.c @@ -36,7 +36,7 @@ struct ip_set_net { bool is_destroyed; /* all sets are destroyed */ }; -static int ip_set_net_id __read_mostly; +static unsigned int ip_set_net_id __read_mostly; static inline struct ip_set_net *ip_set_pernet(struct net *net) { diff --git a/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c b/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c index 5ab1b99..24bf558 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c +++ b/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c @@ -434,7 +434,7 @@ hash_ipportnet6_uadt(struct ip_set *set, struct nlattr *tb[], if (unlikely(tb[IPSET_ATTR_IP_TO])) return -IPSET_ERR_HASH_RANGE_UNSUPPORTED; if (unlikely(tb[IPSET_ATTR_CIDR])) { - u8 cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]); + cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]); if (cidr != HOST_MASK) return -IPSET_ERR_INVALID_CIDR; |