Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[karo-tx-linux.git] / net / ipv4 / ping.c

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 9d3044ff45b93d4a2bcfa916b1577f597863074c..2c00e8bf684d1a3272401652c343b66fa69a3e54 100644 (file)
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -51,15 +51,16 @@ static struct ping_table ping_table;
 
 static u16 ping_port_rover;
 
-static inline int ping_hashfn(struct net *net, unsigned num, unsigned mask)
+static inline int ping_hashfn(struct net *net, unsigned int num, unsigned int mask)
 {
        int res = (num + net_hash_mix(net)) & mask;
+
        pr_debug("hash(%d) = %d\n", num, res);
        return res;
 }
 
 static inline struct hlist_nulls_head *ping_hashslot(struct ping_table *table,
-                                            struct net *net, unsigned num)
+                                            struct net *net, unsigned int num)
 {
        return &table->hash[ping_hashfn(net, num, PING_HTABLE_MASK)];
 }
@@ -188,7 +189,8 @@ static void inet_get_ping_group_range_net(struct net *net, gid_t *low,
                                          gid_t *high)
 {
        gid_t *data = net->ipv4.sysctl_ping_group_range;
-       unsigned seq;
+       unsigned int seq;
+
        do {
                seq = read_seqbegin(&sysctl_local_ports.lock);
 
@@ -415,7 +417,7 @@ struct pingfakehdr {
        __wsum wcheck;
 };
 
-static int ping_getfrag(void *from, char * to,
+static int ping_getfrag(void *from, char *to,
                        int offset, int fraglen, int odd, struct sk_buff *skb)
 {
        struct pingfakehdr *pfh = (struct pingfakehdr *)from;