3 files changed, 22 insertions, 21 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index d99864662582..13a1bc5d3bfd 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -780,7 +780,7 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf)
         int i = 0;
         const char *p;
         const int max_netdevices = 8*PAGE_SIZE;
-        long *inuse;
+        unsigned long *inuse;
         struct net_device *d;
 
         p = strnchr(name, IFNAMSIZ-1, '%');
@@ -794,7 +794,7 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf)
                         return -EINVAL;
 
                 /* Use one page as a bit array of possible slots */
-                inuse = (long *) get_zeroed_page(GFP_ATOMIC);
+                inuse = (unsigned long *) get_zeroed_page(GFP_ATOMIC);
                 if (!inuse)
                         return -ENOMEM;
 
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index f07bd590f8f9..2100c734b102 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -1563,15 +1563,17 @@ static ssize_t pktgen_if_write(struct file *file,
         }
 
         if (!strcmp(name, "mpls")) {
-                unsigned n, offset;
+                unsigned n, cnt;
+
                 len = get_labels(&user_buffer[i], pkt_dev);
-                if (len < 0) { return len; }
+                if (len < 0)
+                        return len;
                 i += len;
-                offset = sprintf(pg_result, "OK: mpls=");
+                cnt = sprintf(pg_result, "OK: mpls=");
                 for (n = 0; n < pkt_dev->nr_labels; n++)
-                        offset += sprintf(pg_result + offset,
-                                          "%08x%s", ntohl(pkt_dev->labels[n]),
-                                          n == pkt_dev->nr_labels-1 ? "" : ",");
+                        cnt += sprintf(pg_result + cnt,
+                                       "%08x%s", ntohl(pkt_dev->labels[n]),
+                                       n == pkt_dev->nr_labels-1 ? "" : ",");
 
                 if (pkt_dev->nr_labels && pkt_dev->vlan_id != 0xffff) {
                         pkt_dev->vlan_id = 0xffff; /* turn off VLAN/SVLAN */
@@ -2731,6 +2733,7 @@ static unsigned int scan_ip6(const char *s, char ip[16])
         unsigned int prefixlen = 0;
         unsigned int suffixlen = 0;
         __be32 tmp;
+        char *pos;
 
         for (i = 0; i < 16; i++)
                 ip[i] = 0;
@@ -2745,12 +2748,9 @@ static unsigned int scan_ip6(const char *s, char ip[16])
                         }
                         s++;
                 }
-                {
-                        char *tmp;
-                        u = simple_strtoul(s, &tmp, 16);
-                        i = tmp - s;
-                }
 
+                u = simple_strtoul(s, &pos, 16);
+                i = pos - s;
                 if (!i)
                         return 0;
                 if (prefixlen == 12 && s[i] == '.') {
@@ -2778,11 +2778,9 @@ static unsigned int scan_ip6(const char *s, char ip[16])
                         len++;
                 } else if (suffixlen != 0)
                         break;
-                {
-                        char *tmp;
-                        u = simple_strtol(s, &tmp, 16);
-                        i = tmp - s;
-                }
+
+                u = simple_strtol(s, &pos, 16);
+                i = pos - s;
                 if (!i) {
                         if (*s)
                                 len--;
diff --git a/net/core/scm.c b/net/core/scm.c
index 44c4ec2c8769..530bee8d9ed9 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -167,7 +167,8 @@ error:
 
 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
 {
-        struct cmsghdr __user *cm = (struct cmsghdr __user *)msg->msg_control;
+        struct cmsghdr __user *cm
+                = (__force struct cmsghdr __user *)msg->msg_control;
         struct cmsghdr cmhdr;
         int cmlen = CMSG_LEN(len);
         int err;
@@ -202,7 +203,8 @@ out:
 
 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
 {
-        struct cmsghdr __user *cm = (struct cmsghdr __user*)msg->msg_control;
+        struct cmsghdr __user *cm
+                = (__force struct cmsghdr __user*)msg->msg_control;
 
         int fdmax = 0;
         int fdnum = scm->fp->count;
@@ -222,7 +224,8 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
         if (fdnum < fdmax)
                 fdmax = fdnum;
 
-        for (i=0, cmfptr=(int __user *)CMSG_DATA(cm); i<fdmax; i++, cmfptr++)
+        for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
+             i++, cmfptr++)
         {
                 int new_fd;
                 err = security_file_receive(fp[i]);