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>

diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h
index 94c27fdd8753ca605eacebc168729edacf7dd573..d174df42cc38aa11bfb29f4d96af982f8e18013e 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set.h
@@ -500,8 +500,8 @@ union ip_set_name_index {
 
 #define IP_SET_OP_GET_BYNAME   0x00000006      /* Get set index by name */
 struct ip_set_req_get_set {
-       unsigned op;
-       unsigned version;
+       unsigned int op;
+       unsigned int version;
        union ip_set_name_index set;
 };
 
@@ -510,8 +510,8 @@ struct ip_set_req_get_set {
 
 #define IP_SET_OP_VERSION      0x00000100      /* Ask kernel version */
 struct ip_set_req_version {
-       unsigned op;
-       unsigned version;
+       unsigned int op;
+       unsigned int version;
 };
 
 #endif /*_IP_SET_H */

diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
index f5e1ac8cfe066512f82ef19a1fc47850674117cf..f9bd61ce4342929b918a49fa129a4c0cdc036db5 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -1648,7 +1648,7 @@ static struct nfnetlink_subsystem ip_set_netlink_subsys __read_mostly = {
 static int
 ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len)
 {
-       unsigned *op;
+       unsigned int *op;
        void *data;
        int copylen = *len, ret = 0;
 
@@ -1656,7 +1656,7 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len)
                return -EPERM;
        if (optval != SO_IP_SET)
                return -EBADF;
-       if (*len < sizeof(unsigned))
+       if (*len < sizeof(unsigned int))
                return -EINVAL;
 
        data = vmalloc(*len);
@@ -1666,7 +1666,7 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len)
                ret = -EFAULT;
                goto done;
        }
-       op = (unsigned *) data;
+       op = (unsigned int *) data;
 
        if (*op < IP_SET_OP_VERSION) {
                /* Check the version at the beginning of operations */