1 files changed, 52 insertions, 66 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 6982bfd6a781..452db7090d18 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -446,7 +446,7 @@ void __dev_remove_pack(struct packet_type *pt)
                 }
         }
 
-        printk(KERN_WARNING "dev_remove_pack: %p not found.\n", pt);
+        pr_warn("dev_remove_pack: %p not found\n", pt);
 out:
         spin_unlock(&ptype_lock);
 }
@@ -848,21 +848,21 @@ EXPORT_SYMBOL(dev_get_by_flags_rcu);
  *      to allow sysfs to work.  We also disallow any kind of
  *      whitespace.
  */
-int dev_valid_name(const char *name)
+bool dev_valid_name(const char *name)
 {
         if (*name == '\0')
-                return 0;
+                return false;
         if (strlen(name) >= IFNAMSIZ)
-                return 0;
+                return false;
         if (!strcmp(name, ".") || !strcmp(name, ".."))
-                return 0;
+                return false;
 
         while (*name) {
                 if (*name == '/' || isspace(*name))
-                        return 0;
+                        return false;
                 name++;
         }
-        return 1;
+        return true;
 }
 EXPORT_SYMBOL(dev_valid_name);
 
@@ -1039,8 +1039,7 @@ rollback:
                         memcpy(dev->name, oldname, IFNAMSIZ);
                         goto rollback;
                 } else {
-                        printk(KERN_ERR
-                               "%s: name change rollback failed: %d.\n",
+                        pr_err("%s: name change rollback failed: %d\n",
                                dev->name, ret);
                 }
         }
@@ -1139,9 +1138,8 @@ void dev_load(struct net *net, const char *name)
                 no_module = request_module("netdev-%s", name);
         if (no_module && capable(CAP_SYS_MODULE)) {
                 if (!request_module("%s", name))
-                        pr_err("Loading kernel module for a network device "
-"with CAP_SYS_MODULE (deprecated).  Use CAP_NET_ADMIN and alias netdev-%s "
-"instead\n", name);
+                        pr_err("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated).  Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
+                               name);
         }
 }
 EXPORT_SYMBOL(dev_load);
@@ -1655,10 +1653,9 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
                         if (skb_network_header(skb2) < skb2->data ||
                             skb2->network_header > skb2->tail) {
                                 if (net_ratelimit())
-                                        printk(KERN_CRIT "protocol %04x is "
-                                               "buggy, dev %s\n",
-                                               ntohs(skb2->protocol),
-                                               dev->name);
+                                        pr_crit("protocol %04x is buggy, dev %s\n",
+                                                ntohs(skb2->protocol),
+                                                dev->name);
                                 skb_reset_network_header(skb2);
                         }
 
@@ -1691,9 +1688,7 @@ static void netif_setup_tc(struct net_device *dev, unsigned int txq)
 
         /* If TC0 is invalidated disable TC mapping */
         if (tc->offset + tc->count > txq) {
-                pr_warning("Number of in use tx queues changed "
-                           "invalidating tc mappings. Priority "
-                           "traffic classification disabled!\n");
+                pr_warn("Number of in use tx queues changed invalidating tc mappings. Priority traffic classification disabled!\n");
                 dev->num_tc = 0;
                 return;
         }
@@ -1704,11 +1699,8 @@ static void netif_setup_tc(struct net_device *dev, unsigned int txq)
 
                 tc = &dev->tc_to_txq[q];
                 if (tc->offset + tc->count > txq) {
-                        pr_warning("Number of in use tx queues "
-                                   "changed. Priority %i to tc "
-                                   "mapping %i is no longer valid "
-                                   "setting map to 0\n",
-                                   i, q);
+                        pr_warn("Number of in use tx queues changed. Priority %i to tc mapping %i is no longer valid. Setting map to 0\n",
+                                i, q);
                         netdev_set_prio_tc_map(dev, i, 0);
                 }
         }
@@ -2014,8 +2006,7 @@ EXPORT_SYMBOL(skb_gso_segment);
 void netdev_rx_csum_fault(struct net_device *dev)
 {
         if (net_ratelimit()) {
-                printk(KERN_ERR "%s: hw csum failure.\n",
-                        dev ? dev->name : "<unknown>");
+                pr_err("%s: hw csum failure\n", dev ? dev->name : "<unknown>");
                 dump_stack();
         }
 }
@@ -2332,9 +2323,9 @@ static inline u16 dev_cap_txqueue(struct net_device *dev, u16 queue_index)
 {
         if (unlikely(queue_index >= dev->real_num_tx_queues)) {
                 if (net_ratelimit()) {
-                        pr_warning("%s selects TX queue %d, but "
-                                "real number of TX queues is %d\n",
-                                dev->name, queue_index, dev->real_num_tx_queues);
+                        pr_warn("%s selects TX queue %d, but real number of TX queues is %d\n",
+                                dev->name, queue_index,
+                                dev->real_num_tx_queues);
                 }
                 return 0;
         }
@@ -2578,16 +2569,16 @@ int dev_queue_xmit(struct sk_buff *skb)
                         }
                         HARD_TX_UNLOCK(dev, txq);
                         if (net_ratelimit())
-                                printk(KERN_CRIT "Virtual device %s asks to "
-                                       "queue packet!\n", dev->name);
+                                pr_crit("Virtual device %s asks to queue packet!\n",
+                                        dev->name);
                 } else {
                         /* Recursion is detected! It is possible,
                          * unfortunately
                          */
 recursion_alert:
                         if (net_ratelimit())
-                                printk(KERN_CRIT "Dead loop on virtual device "
-                                       "%s, fix it urgently!\n", dev->name);
+                                pr_crit("Dead loop on virtual device %s, fix it urgently!\n",
+                                        dev->name);
                 }
         }
 
@@ -3069,8 +3060,8 @@ static int ing_filter(struct sk_buff *skb, struct netdev_queue *rxq)
 
         if (unlikely(MAX_RED_LOOP < ttl++)) {
                 if (net_ratelimit())
-                        pr_warning( "Redir loop detected Dropping packet (%d->%d)\n",
-                               skb->skb_iif, dev->ifindex);
+                        pr_warn("Redir loop detected Dropping packet (%d->%d)\n",
+                                skb->skb_iif, dev->ifindex);
                 return TC_ACT_SHOT;
         }
 
@@ -3569,7 +3560,8 @@ EXPORT_SYMBOL(napi_gro_receive);
 static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
 {
         __skb_pull(skb, skb_headlen(skb));
-        skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));
+        /* restore the reserve we had after netdev_alloc_skb_ip_align() */
+        skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN - skb_headroom(skb));
         skb->vlan_tci = 0;
         skb->dev = napi->dev;
         skb->skb_iif = 0;
@@ -4497,16 +4489,15 @@ static int __dev_set_promiscuity(struct net_device *dev, int inc)
                         dev->flags &= ~IFF_PROMISC;
                 else {
                         dev->promiscuity -= inc;
-                        printk(KERN_WARNING "%s: promiscuity touches roof, "
-                                "set promiscuity failed, promiscuity feature "
-                                "of device might be broken.\n", dev->name);
+                        pr_warn("%s: promiscuity touches roof, set promiscuity failed. promiscuity feature of device might be broken.\n",
+                                dev->name);
                         return -EOVERFLOW;
                 }
         }
         if (dev->flags != old_flags) {
-                printk(KERN_INFO "device %s %s promiscuous mode\n",
-                       dev->name, (dev->flags & IFF_PROMISC) ? "entered" :
-                                                               "left");
+                pr_info("device %s %s promiscuous mode\n",
+                        dev->name,
+                        dev->flags & IFF_PROMISC ? "entered" : "left");
                 if (audit_enabled) {
                         current_uid_gid(&uid, &gid);
                         audit_log(current->audit_context, GFP_ATOMIC,
@@ -4579,9 +4570,8 @@ int dev_set_allmulti(struct net_device *dev, int inc)
                         dev->flags &= ~IFF_ALLMULTI;
                 else {
                         dev->allmulti -= inc;
-                        printk(KERN_WARNING "%s: allmulti touches roof, "
-                                "set allmulti failed, allmulti feature of "
-                                "device might be broken.\n", dev->name);
+                        pr_warn("%s: allmulti touches roof, set allmulti failed. allmulti feature of device might be broken.\n",
+                                dev->name);
                         return -EOVERFLOW;
                 }
         }
@@ -5238,8 +5228,8 @@ static void rollback_registered_many(struct list_head *head)
                  * devices and proceed with the remaining.
                  */
                 if (dev->reg_state == NETREG_UNINITIALIZED) {
-                        pr_debug("unregister_netdevice: device %s/%p never "
-                                 "was registered\n", dev->name, dev);
+                        pr_debug("unregister_netdevice: device %s/%p never was registered\n",
+                                 dev->name, dev);
 
                         WARN_ON(1);
                         list_del(&dev->unreg_list);
@@ -5471,7 +5461,7 @@ static int netif_alloc_rx_queues(struct net_device *dev)
 
         rx = kcalloc(count, sizeof(struct netdev_rx_queue), GFP_KERNEL);
         if (!rx) {
-                pr_err("netdev: Unable to allocate %u rx queues.\n", count);
+                pr_err("netdev: Unable to allocate %u rx queues\n", count);
                 return -ENOMEM;
         }
         dev->_rx = rx;
@@ -5505,8 +5495,7 @@ static int netif_alloc_netdev_queues(struct net_device *dev)
 
         tx = kcalloc(count, sizeof(struct netdev_queue), GFP_KERNEL);
         if (!tx) {
-                pr_err("netdev: Unable to allocate %u tx queues.\n",
-                       count);
+                pr_err("netdev: Unable to allocate %u tx queues\n", count);
                 return -ENOMEM;
         }
         dev->_tx = tx;
@@ -5765,10 +5754,8 @@ static void netdev_wait_allrefs(struct net_device *dev)
                 refcnt = netdev_refcnt_read(dev);
 
                 if (time_after(jiffies, warning_time + 10 * HZ)) {
-                        printk(KERN_EMERG "unregister_netdevice: "
-                               "waiting for %s to become free. Usage "
-                               "count = %d\n",
-                               dev->name, refcnt);
+                        pr_emerg("unregister_netdevice: waiting for %s to become free. Usage count = %d\n",
+                                 dev->name, refcnt);
                         warning_time = jiffies;
                 }
         }
@@ -5819,7 +5806,7 @@ void netdev_run_todo(void)
                 list_del(&dev->todo_list);
 
                 if (unlikely(dev->reg_state != NETREG_UNREGISTERING)) {
-                        printk(KERN_ERR "network todo '%s' but state %d\n",
+                        pr_err("network todo '%s' but state %d\n",
                                dev->name, dev->reg_state);
                         dump_stack();
                         continue;
@@ -5848,12 +5835,12 @@ void netdev_run_todo(void)
 /* Convert net_device_stats to rtnl_link_stats64.  They have the same
  * fields in the same order, with only the type differing.
  */
-static void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64,
-                                    const struct net_device_stats *netdev_stats)
+void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64,
+                             const struct net_device_stats *netdev_stats)
 {
 #if BITS_PER_LONG == 64
-        BUILD_BUG_ON(sizeof(*stats64) != sizeof(*netdev_stats));
-        memcpy(stats64, netdev_stats, sizeof(*stats64));
+        BUILD_BUG_ON(sizeof(*stats64) != sizeof(*netdev_stats));
+        memcpy(stats64, netdev_stats, sizeof(*stats64));
 #else
         size_t i, n = sizeof(*stats64) / sizeof(u64);
         const unsigned long *src = (const unsigned long *)netdev_stats;
@@ -5865,6 +5852,7 @@ static void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64,
                 dst[i] = src[i];
 #endif
 }
+EXPORT_SYMBOL(netdev_stats_to_stats64);
 
 /**
  *      dev_get_stats   - get network device statistics
@@ -5935,15 +5923,13 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
         BUG_ON(strlen(name) >= sizeof(dev->name));
 
         if (txqs < 1) {
-                pr_err("alloc_netdev: Unable to allocate device "
-                       "with zero queues.\n");
+                pr_err("alloc_netdev: Unable to allocate device with zero queues\n");
                 return NULL;
         }
 
 #ifdef CONFIG_RPS
         if (rxqs < 1) {
-                pr_err("alloc_netdev: Unable to allocate device "
-                       "with zero RX queues.\n");
+                pr_err("alloc_netdev: Unable to allocate device with zero RX queues\n");
                 return NULL;
         }
 #endif
@@ -5959,7 +5945,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
 
         p = kzalloc(alloc_size, GFP_KERNEL);
         if (!p) {
-                printk(KERN_ERR "alloc_netdev: Unable to allocate device.\n");
+                pr_err("alloc_netdev: Unable to allocate device\n");
                 return NULL;
         }
 
@@ -6492,8 +6478,8 @@ static void __net_exit default_device_exit(struct net *net)
                 snprintf(fb_name, IFNAMSIZ, "dev%d", dev->ifindex);
                 err = dev_change_net_namespace(dev, &init_net, fb_name);
                 if (err) {
-                        printk(KERN_EMERG "%s: failed to move %s to init_net: %d\n",
-                                __func__, dev->name, err);
+                        pr_emerg("%s: failed to move %s to init_net: %d\n",
+                                 __func__, dev->name, err);
                         BUG();
                 }
         }