6 files changed, 20 insertions, 26 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index d030575532a2..8f9710c62e20 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4024,6 +4024,7 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff
                 NAPI_GRO_CB(skb)->flush = 0;
                 NAPI_GRO_CB(skb)->free = 0;
                 NAPI_GRO_CB(skb)->udp_mark = 0;
+                NAPI_GRO_CB(skb)->gro_remcsum_start = 0;
 
                 /* Setup for GRO checksum validation */
                 switch (skb->ip_summed) {
@@ -5335,7 +5336,7 @@ EXPORT_SYMBOL(netdev_upper_dev_unlink);
 /**
  * netdev_bonding_info_change - Dispatch event about slave change
  * @dev: device
- * @netdev_bonding_info: info to dispatch
+ * @bonding_info: info to dispatch
  *
  * Send NETDEV_BONDING_INFO to netdev notifiers with info.
  * The caller must hold the RTNL lock.
diff --git a/net/core/filter.c b/net/core/filter.c
index ec9baea10c16..f6bdc2b1ba01 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -531,7 +531,7 @@ do_pass:
                         *insn = BPF_LDX_MEM(BPF_W, BPF_REG_A, BPF_REG_CTX, fp->k);
                         break;
 
-                /* Unkown instruction. */
+                /* Unknown instruction. */
                 default:
                         goto err;
                 }
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 999341244434..f2aa73bfb0e4 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -614,8 +614,7 @@ static ssize_t show_rps_map(struct netdev_rx_queue *queue,
 {
         struct rps_map *map;
         cpumask_var_t mask;
-        size_t len = 0;
-        int i;
+        int i, len;
 
         if (!zalloc_cpumask_var(&mask, GFP_KERNEL))
                 return -ENOMEM;
@@ -626,17 +625,11 @@ static ssize_t show_rps_map(struct netdev_rx_queue *queue,
                 for (i = 0; i < map->len; i++)
                         cpumask_set_cpu(map->cpus[i], mask);
 
-        len += cpumask_scnprintf(buf + len, PAGE_SIZE, mask);
-        if (PAGE_SIZE - len < 3) {
-                rcu_read_unlock();
-                free_cpumask_var(mask);
-                return -EINVAL;
-        }
+        len = snprintf(buf, PAGE_SIZE, "%*pb\n", cpumask_pr_args(mask));
         rcu_read_unlock();
-
         free_cpumask_var(mask);
-        len += sprintf(buf + len, "\n");
-        return len;
+
+        return len < PAGE_SIZE ? len : -EINVAL;
 }
 
 static ssize_t store_rps_map(struct netdev_rx_queue *queue,
@@ -1090,8 +1083,7 @@ static ssize_t show_xps_map(struct netdev_queue *queue,
         struct xps_dev_maps *dev_maps;
         cpumask_var_t mask;
         unsigned long index;
-        size_t len = 0;
-        int i;
+        int i, len;
 
         if (!zalloc_cpumask_var(&mask, GFP_KERNEL))
                 return -ENOMEM;
@@ -1117,15 +1109,9 @@ static ssize_t show_xps_map(struct netdev_queue *queue,
         }
         rcu_read_unlock();
 
-        len += cpumask_scnprintf(buf + len, PAGE_SIZE, mask);
-        if (PAGE_SIZE - len < 3) {
-                free_cpumask_var(mask);
-                return -EINVAL;
-        }
-
+        len = snprintf(buf, PAGE_SIZE, "%*pb\n", cpumask_pr_args(mask));
         free_cpumask_var(mask);
-        len += sprintf(buf + len, "\n");
-        return len;
+        return len < PAGE_SIZE ? len : -EINVAL;
 }
 
 static ssize_t store_xps_map(struct netdev_queue *queue,
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 9fa25b0ea145..b4899f5b7388 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -97,7 +97,7 @@
  * New xmit() return, do_div and misc clean up by Stephen Hemminger
  * <shemminger@osdl.org> 040923
  *
- * Randy Dunlap fixed u64 printk compiler waring
+ * Randy Dunlap fixed u64 printk compiler warning
  *
  * Remove FCS from BW calculation.  Lennert Buytenhek <buytenh@wantstofly.org>
  * New time handling. Lennert Buytenhek <buytenh@wantstofly.org> 041213
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 5be499b6a2d2..ab293a3066b3 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2162,7 +2162,14 @@ replay:
                 }
                 err = rtnl_configure_link(dev, ifm);
                 if (err < 0) {
-                        unregister_netdevice(dev);
+                        if (ops->newlink) {
+                                LIST_HEAD(list_kill);
+
+                                ops->dellink(dev, &list_kill);
+                                unregister_netdevice_many(&list_kill);
+                        } else {
+                                unregister_netdevice(dev);
+                        }
                         goto out;
                 }
 
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index eaa51ddf2368..433424804284 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -155,7 +155,7 @@ write_unlock:
                 rcu_read_unlock();
 
                 len = min(sizeof(kbuf) - 1, *lenp);
-                len = cpumask_scnprintf(kbuf, len, mask);
+                len = scnprintf(kbuf, len, "%*pb", cpumask_pr_args(mask));
                 if (!len) {
                         *lenp = 0;
                         goto done;