net: cleanup unsigned to unsigned int
Use of "unsigned int" is preferred to bare "unsigned" in net tree. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

gecommit door
David S. Miller

bovenliggende
5e73ea1a31
commit
95c9617472
@@ -8,7 +8,7 @@
|
||||
|
||||
#define IPV6_ADDR_SCOPE_TYPE(scope) ((scope) << 16)
|
||||
|
||||
static inline unsigned ipv6_addr_scope2type(unsigned scope)
|
||||
static inline unsigned int ipv6_addr_scope2type(unsigned int scope)
|
||||
{
|
||||
switch (scope) {
|
||||
case IPV6_ADDR_SCOPE_NODELOCAL:
|
||||
|
@@ -515,7 +515,7 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)
|
||||
u8 nexthdr = ipv6_hdr(skb)->nexthdr;
|
||||
|
||||
while (off <= opt->lastopt) {
|
||||
unsigned len;
|
||||
unsigned int len;
|
||||
u8 *ptr = nh + off;
|
||||
|
||||
switch (nexthdr) {
|
||||
|
@@ -705,9 +705,9 @@ static int ip6fl_seq_show(struct seq_file *seq, void *v)
|
||||
struct ip6_flowlabel *fl = v;
|
||||
seq_printf(seq,
|
||||
"%05X %-1d %-6d %-6d %-6ld %-8ld %pi6 %-4d\n",
|
||||
(unsigned)ntohl(fl->label),
|
||||
(unsigned int)ntohl(fl->label),
|
||||
fl->share,
|
||||
(unsigned)fl->owner,
|
||||
(int)fl->owner,
|
||||
atomic_read(&fl->users),
|
||||
fl->linger/HZ,
|
||||
(long)(fl->expires - jiffies)/HZ,
|
||||
|
@@ -198,7 +198,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n, const struct ip6_tnl_parm *p)
|
||||
{
|
||||
const struct in6_addr *remote = &p->raddr;
|
||||
const struct in6_addr *local = &p->laddr;
|
||||
unsigned h = 0;
|
||||
unsigned int h = 0;
|
||||
int prio = 0;
|
||||
|
||||
if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) {
|
||||
|
@@ -942,7 +942,7 @@ static int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_txoptions *opt,
|
||||
}
|
||||
|
||||
static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
|
||||
char __user *optval, int __user *optlen, unsigned flags)
|
||||
char __user *optval, int __user *optlen, unsigned int flags)
|
||||
{
|
||||
struct ipv6_pinfo *np = inet6_sk(sk);
|
||||
int len;
|
||||
|
@@ -396,7 +396,7 @@ ip6t_do_table(struct sk_buff *skb,
|
||||
if (v < 0) {
|
||||
/* Pop from stack? */
|
||||
if (v != XT_RETURN) {
|
||||
verdict = (unsigned)(-v) - 1;
|
||||
verdict = (unsigned int)(-v) - 1;
|
||||
break;
|
||||
}
|
||||
if (*stackptr <= origptr)
|
||||
|
@@ -82,7 +82,7 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu);
|
||||
static struct rt6_info *rt6_add_route_info(struct net *net,
|
||||
const struct in6_addr *prefix, int prefixlen,
|
||||
const struct in6_addr *gwaddr, int ifindex,
|
||||
unsigned pref);
|
||||
unsigned int pref);
|
||||
static struct rt6_info *rt6_get_route_info(struct net *net,
|
||||
const struct in6_addr *prefix, int prefixlen,
|
||||
const struct in6_addr *gwaddr, int ifindex);
|
||||
@@ -1870,7 +1870,7 @@ out:
|
||||
static struct rt6_info *rt6_add_route_info(struct net *net,
|
||||
const struct in6_addr *prefix, int prefixlen,
|
||||
const struct in6_addr *gwaddr, int ifindex,
|
||||
unsigned pref)
|
||||
unsigned int pref)
|
||||
{
|
||||
struct fib6_config cfg = {
|
||||
.fc_table = RT6_TABLE_INFO,
|
||||
@@ -2200,10 +2200,9 @@ void rt6_ifdown(struct net *net, struct net_device *dev)
|
||||
icmp6_clean_all(fib6_ifdown, &adn);
|
||||
}
|
||||
|
||||
struct rt6_mtu_change_arg
|
||||
{
|
||||
struct rt6_mtu_change_arg {
|
||||
struct net_device *dev;
|
||||
unsigned mtu;
|
||||
unsigned int mtu;
|
||||
};
|
||||
|
||||
static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg)
|
||||
@@ -2245,7 +2244,7 @@ static int rt6_mtu_change_route(struct rt6_info *rt, void *p_arg)
|
||||
return 0;
|
||||
}
|
||||
|
||||
void rt6_mtu_change(struct net_device *dev, unsigned mtu)
|
||||
void rt6_mtu_change(struct net_device *dev, unsigned int mtu)
|
||||
{
|
||||
struct rt6_mtu_change_arg arg = {
|
||||
.dev = dev,
|
||||
|
@@ -68,9 +68,9 @@ static DEFINE_SPINLOCK(xfrm6_tunnel_spi_lock);
|
||||
|
||||
static struct kmem_cache *xfrm6_tunnel_spi_kmem __read_mostly;
|
||||
|
||||
static inline unsigned xfrm6_tunnel_spi_hash_byaddr(const xfrm_address_t *addr)
|
||||
static inline unsigned int xfrm6_tunnel_spi_hash_byaddr(const xfrm_address_t *addr)
|
||||
{
|
||||
unsigned h;
|
||||
unsigned int h;
|
||||
|
||||
h = (__force u32)(addr->a6[0] ^ addr->a6[1] ^ addr->a6[2] ^ addr->a6[3]);
|
||||
h ^= h >> 16;
|
||||
@@ -80,7 +80,7 @@ static inline unsigned xfrm6_tunnel_spi_hash_byaddr(const xfrm_address_t *addr)
|
||||
return h;
|
||||
}
|
||||
|
||||
static inline unsigned xfrm6_tunnel_spi_hash_byspi(u32 spi)
|
||||
static inline unsigned int xfrm6_tunnel_spi_hash_byspi(u32 spi)
|
||||
{
|
||||
return spi % XFRM6_TUNNEL_SPI_BYSPI_HSIZE;
|
||||
}
|
||||
|
Verwijs in nieuw issue
Block a user