1 files changed, 259 insertions, 149 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 723a34710ad4..e1c1cdcc2bb0 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -101,8 +101,6 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/stat.h>
-#include <linux/if_bridge.h>
-#include <linux/if_macvlan.h>
 #include <net/dst.h>
 #include <net/pkt_sched.h>
 #include <net/checksum.h>
@@ -803,35 +801,31 @@ struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type)
 EXPORT_SYMBOL(dev_getfirstbyhwtype);
 
 /**
- *      dev_get_by_flags - find any device with given flags
+ *      dev_get_by_flags_rcu - find any device with given flags
  *      @net: the applicable net namespace
  *      @if_flags: IFF_* values
  *      @mask: bitmask of bits in if_flags to check
  *
  *      Search for any interface with the given flags. Returns NULL if a device
- *      is not found or a pointer to the device. The device returned has
- *      had a reference added and the pointer is safe until the user calls
- *      dev_put to indicate they have finished with it.
+ *      is not found or a pointer to the device. Must be called inside
+ *      rcu_read_lock(), and result refcount is unchanged.
  */
 
-struct net_device *dev_get_by_flags(struct net *net, unsigned short if_flags,
+struct net_device *dev_get_by_flags_rcu(struct net *net, unsigned short if_flags,
                                     unsigned short mask)
 {
         struct net_device *dev, *ret;
 
         ret = NULL;
-        rcu_read_lock();
         for_each_netdev_rcu(net, dev) {
                 if (((dev->flags ^ if_flags) & mask) == 0) {
-                        dev_hold(dev);
                         ret = dev;
                         break;
                 }
         }
-        rcu_read_unlock();
         return ret;
 }
-EXPORT_SYMBOL(dev_get_by_flags);
+EXPORT_SYMBOL(dev_get_by_flags_rcu);
 
 /**
  *      dev_valid_name - check if name is okay for network device
@@ -1488,6 +1482,7 @@ static inline void net_timestamp_check(struct sk_buff *skb)
 int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
 {
         skb_orphan(skb);
+        nf_reset(skb);
 
         if (!(dev->flags & IFF_UP) ||
             (skb->len > (dev->mtu + dev->hard_header_len))) {
@@ -1541,7 +1536,8 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
                                 if (net_ratelimit())
                                         printk(KERN_CRIT "protocol %04x is "
                                                "buggy, dev %s\n",
-                                               skb2->protocol, dev->name);
+                                               ntohs(skb2->protocol),
+                                               dev->name);
                                 skb_reset_network_header(skb2);
                         }
 
@@ -1911,8 +1907,32 @@ static int dev_gso_segment(struct sk_buff *skb)
  */
 static inline void skb_orphan_try(struct sk_buff *skb)
 {
-        if (!skb_tx(skb)->flags)
+        struct sock *sk = skb->sk;
+
+        if (sk && !skb_tx(skb)->flags) {
+                /* skb_tx_hash() wont be able to get sk.
+                 * We copy sk_hash into skb->rxhash
+                 */
+                if (!skb->rxhash)
+                        skb->rxhash = sk->sk_hash;
                 skb_orphan(skb);
+        }
+}
+
+/*
+ * Returns true if either:
+ *      1. skb has frag_list and the device doesn't support FRAGLIST, or
+ *      2. skb is fragmented and the device does not support SG, or if
+ *         at least one of fragments is in highmem and device does not
+ *         support DMA from it.
+ */
+static inline int skb_needs_linearize(struct sk_buff *skb,
+                                      struct net_device *dev)
+{
+        return skb_is_nonlinear(skb) &&
+               ((skb_has_frags(skb) && !(dev->features & NETIF_F_FRAGLIST)) ||
+                (skb_shinfo(skb)->nr_frags && (!(dev->features & NETIF_F_SG) ||
+                                              illegal_highdma(dev, skb))));
 }
 
 int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
@@ -1939,6 +1959,22 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
                                 goto out_kfree_skb;
                         if (skb->next)
                                 goto gso;
+                } else {
+                        if (skb_needs_linearize(skb, dev) &&
+                            __skb_linearize(skb))
+                                goto out_kfree_skb;
+
+                        /* If packet is not checksummed and device does not
+                         * support checksumming for this protocol, complete
+                         * checksumming here.
+                         */
+                        if (skb->ip_summed == CHECKSUM_PARTIAL) {
+                                skb_set_transport_header(skb, skb->csum_start -
+                                              skb_headroom(skb));
+                                if (!dev_can_checksum(dev, skb) &&
+                                     skb_checksum_help(skb))
+                                        goto out_kfree_skb;
+                        }
                 }
 
                 rc = ops->ndo_start_xmit(skb, dev);
@@ -1998,8 +2034,7 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb)
         if (skb->sk && skb->sk->sk_hash)
                 hash = skb->sk->sk_hash;
         else
-                hash = (__force u16) skb->protocol;
-
+                hash = (__force u16) skb->protocol ^ skb->rxhash;
         hash = jhash_1word(hash, hashrnd);
 
         return (u16) (((u64) hash * dev->real_num_tx_queues) >> 32);
@@ -2022,12 +2057,11 @@ static inline u16 dev_cap_txqueue(struct net_device *dev, u16 queue_index)
 static struct netdev_queue *dev_pick_tx(struct net_device *dev,
                                         struct sk_buff *skb)
 {
-        u16 queue_index;
+        int queue_index;
         struct sock *sk = skb->sk;
 
-        if (sk_tx_queue_recorded(sk)) {
-                queue_index = sk_tx_queue_get(sk);
-        } else {
+        queue_index = sk_tx_queue_get(sk);
+        if (queue_index < 0) {
                 const struct net_device_ops *ops = dev->netdev_ops;
 
                 if (ops->ndo_select_queue) {
@@ -2056,14 +2090,24 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
                                  struct netdev_queue *txq)
 {
         spinlock_t *root_lock = qdisc_lock(q);
+        bool contended = qdisc_is_running(q);
         int rc;
 
+        /*
+         * Heuristic to force contended enqueues to serialize on a
+         * separate lock before trying to get qdisc main lock.
+         * This permits __QDISC_STATE_RUNNING owner to get the lock more often
+         * and dequeue packets faster.
+         */
+        if (unlikely(contended))
+                spin_lock(&q->busylock);
+
         spin_lock(root_lock);
         if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) {
                 kfree_skb(skb);
                 rc = NET_XMIT_DROP;
         } else if ((q->flags & TCQ_F_CAN_BYPASS) && !qdisc_qlen(q) &&
-                   !test_and_set_bit(__QDISC_STATE_RUNNING, &q->state)) {
+                   qdisc_run_begin(q)) {
                 /*
                  * This is a work-conserving queue; there are no old skbs
                  * waiting to be sent out; and the qdisc is not running -
@@ -2072,37 +2116,33 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
                 if (!(dev->priv_flags & IFF_XMIT_DST_RELEASE))
                         skb_dst_force(skb);
                 __qdisc_update_bstats(q, skb->len);
-                if (sch_direct_xmit(skb, q, dev, txq, root_lock))
+                if (sch_direct_xmit(skb, q, dev, txq, root_lock)) {
+                        if (unlikely(contended)) {
+                                spin_unlock(&q->busylock);
+                                contended = false;
+                        }
                         __qdisc_run(q);
-                else
-                        clear_bit(__QDISC_STATE_RUNNING, &q->state);
+                } else
+                        qdisc_run_end(q);
 
                 rc = NET_XMIT_SUCCESS;
         } else {
                 skb_dst_force(skb);
                 rc = qdisc_enqueue_root(skb, q);
-                qdisc_run(q);
+                if (qdisc_run_begin(q)) {
+                        if (unlikely(contended)) {
+                                spin_unlock(&q->busylock);
+                                contended = false;
+                        }
+                        __qdisc_run(q);
+                }
         }
         spin_unlock(root_lock);
-
+        if (unlikely(contended))
+                spin_unlock(&q->busylock);
         return rc;
 }
 
-/*
- * Returns true if either:
- *      1. skb has frag_list and the device doesn't support FRAGLIST, or
- *      2. skb is fragmented and the device does not support SG, or if
- *         at least one of fragments is in highmem and device does not
- *         support DMA from it.
- */
-static inline int skb_needs_linearize(struct sk_buff *skb,
-                                      struct net_device *dev)
-{
-        return (skb_has_frags(skb) && !(dev->features & NETIF_F_FRAGLIST)) ||
-               (skb_shinfo(skb)->nr_frags && (!(dev->features & NETIF_F_SG) ||
-                                              illegal_highdma(dev, skb)));
-}
-
 /**
  *      dev_queue_xmit - transmit a buffer
  *      @skb: buffer to transmit
@@ -2135,25 +2175,6 @@ int dev_queue_xmit(struct sk_buff *skb)
         struct Qdisc *q;
         int rc = -ENOMEM;
 
-        /* GSO will handle the following emulations directly. */
-        if (netif_needs_gso(dev, skb))
-                goto gso;
-
-        /* Convert a paged skb to linear, if required */
-        if (skb_needs_linearize(skb, dev) && __skb_linearize(skb))
-                goto out_kfree_skb;
-
-        /* If packet is not checksummed and device does not support
-         * checksumming for this protocol, complete checksumming here.
-         */
-        if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                skb_set_transport_header(skb, skb->csum_start -
-                                              skb_headroom(skb));
-                if (!dev_can_checksum(dev, skb) && skb_checksum_help(skb))
-                        goto out_kfree_skb;
-        }
-
-gso:
         /* Disable soft irqs for various locks below. Also
          * stops preemption for RCU.
          */
@@ -2212,7 +2233,6 @@ gso:
         rc = -ENETDOWN;
         rcu_read_unlock_bh();
 
-out_kfree_skb:
         kfree_skb(skb);
         return rc;
 out:
@@ -2597,70 +2617,14 @@ static inline int deliver_skb(struct sk_buff *skb,
         return pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
 }
 
-#if defined(CONFIG_BRIDGE) || defined (CONFIG_BRIDGE_MODULE)
-
-#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
+#if (defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)) && \
+    (defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE))
 /* This hook is defined here for ATM LANE */
 int (*br_fdb_test_addr_hook)(struct net_device *dev,
                              unsigned char *addr) __read_mostly;
 EXPORT_SYMBOL_GPL(br_fdb_test_addr_hook);
 #endif
 
-/*
- * If bridge module is loaded call bridging hook.
- *  returns NULL if packet was consumed.
- */
-struct sk_buff *(*br_handle_frame_hook)(struct net_bridge_port *p,
-                                        struct sk_buff *skb) __read_mostly;
-EXPORT_SYMBOL_GPL(br_handle_frame_hook);
-
-static inline struct sk_buff *handle_bridge(struct sk_buff *skb,
-                                            struct packet_type **pt_prev, int *ret,
-                                            struct net_device *orig_dev)
-{
-        struct net_bridge_port *port;
-
-        if (skb->pkt_type == PACKET_LOOPBACK ||
-            (port = rcu_dereference(skb->dev->br_port)) == NULL)
-                return skb;
-
-        if (*pt_prev) {
-                *ret = deliver_skb(skb, *pt_prev, orig_dev);
-                *pt_prev = NULL;
-        }
-
-        return br_handle_frame_hook(port, skb);
-}
-#else
-#define handle_bridge(skb, pt_prev, ret, orig_dev)      (skb)
-#endif
-
-#if defined(CONFIG_MACVLAN) || defined(CONFIG_MACVLAN_MODULE)
-struct sk_buff *(*macvlan_handle_frame_hook)(struct macvlan_port *p,
-                                             struct sk_buff *skb) __read_mostly;
-EXPORT_SYMBOL_GPL(macvlan_handle_frame_hook);
-
-static inline struct sk_buff *handle_macvlan(struct sk_buff *skb,
-                                             struct packet_type **pt_prev,
-                                             int *ret,
-                                             struct net_device *orig_dev)
-{
-        struct macvlan_port *port;
-
-        port = rcu_dereference(skb->dev->macvlan_port);
-        if (!port)
-                return skb;
-
-        if (*pt_prev) {
-                *ret = deliver_skb(skb, *pt_prev, orig_dev);
-                *pt_prev = NULL;
-        }
-        return macvlan_handle_frame_hook(port, skb);
-}
-#else
-#define handle_macvlan(skb, pt_prev, ret, orig_dev)     (skb)
-#endif
-
 #ifdef CONFIG_NET_CLS_ACT
 /* TODO: Maybe we should just force sch_ingress to be compiled in
  * when CONFIG_NET_CLS_ACT is? otherwise some useless instructions
@@ -2678,10 +2642,10 @@ static int ing_filter(struct sk_buff *skb)
         int result = TC_ACT_OK;
         struct Qdisc *q;
 
-        if (MAX_RED_LOOP < ttl++) {
-                printk(KERN_WARNING
-                       "Redir loop detected Dropping packet (%d->%d)\n",
-                       skb->skb_iif, dev->ifindex);
+        if (unlikely(MAX_RED_LOOP < ttl++)) {
+                if (net_ratelimit())
+                        pr_warning( "Redir loop detected Dropping packet (%d->%d)\n",
+                               skb->skb_iif, dev->ifindex);
                 return TC_ACT_SHOT;
         }
 
@@ -2711,9 +2675,6 @@ static inline struct sk_buff *handle_ing(struct sk_buff *skb,
         if (*pt_prev) {
                 *ret = deliver_skb(skb, *pt_prev, orig_dev);
                 *pt_prev = NULL;
-        } else {
-                /* Huh? Why does turning on AF_PACKET affect this? */
-                skb->tc_verd = SET_TC_OK2MUNGE(skb->tc_verd);
         }
 
         switch (ing_filter(skb)) {
@@ -2756,6 +2717,51 @@ void netif_nit_deliver(struct sk_buff *skb)
         rcu_read_unlock();
 }
 
+/**
+ *      netdev_rx_handler_register - register receive handler
+ *      @dev: device to register a handler for
+ *      @rx_handler: receive handler to register
+ *      @rx_handler_data: data pointer that is used by rx handler
+ *
+ *      Register a receive hander for a device. This handler will then be
+ *      called from __netif_receive_skb. A negative errno code is returned
+ *      on a failure.
+ *
+ *      The caller must hold the rtnl_mutex.
+ */
+int netdev_rx_handler_register(struct net_device *dev,
+                               rx_handler_func_t *rx_handler,
+                               void *rx_handler_data)
+{
+        ASSERT_RTNL();
+
+        if (dev->rx_handler)
+                return -EBUSY;
+
+        rcu_assign_pointer(dev->rx_handler_data, rx_handler_data);
+        rcu_assign_pointer(dev->rx_handler, rx_handler);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(netdev_rx_handler_register);
+
+/**
+ *      netdev_rx_handler_unregister - unregister receive handler
+ *      @dev: device to unregister a handler from
+ *
+ *      Unregister a receive hander from a device.
+ *
+ *      The caller must hold the rtnl_mutex.
+ */
+void netdev_rx_handler_unregister(struct net_device *dev)
+{
+
+        ASSERT_RTNL();
+        rcu_assign_pointer(dev->rx_handler, NULL);
+        rcu_assign_pointer(dev->rx_handler_data, NULL);
+}
+EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
+
 static inline void skb_bond_set_mac_by_master(struct sk_buff *skb,
                                               struct net_device *master)
 {
@@ -2777,7 +2783,8 @@ int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master)
         if (master->priv_flags & IFF_MASTER_ARPMON)
                 dev->last_rx = jiffies;
 
-        if ((master->priv_flags & IFF_MASTER_ALB) && master->br_port) {
+        if ((master->priv_flags & IFF_MASTER_ALB) &&
+            (master->priv_flags & IFF_BRIDGE_PORT)) {
                 /* Do address unmangle. The local destination address
                  * will be always the one master has. Provides the right
                  * functionality in a bridge.
@@ -2808,6 +2815,7 @@ EXPORT_SYMBOL(__skb_bond_should_drop);
 static int __netif_receive_skb(struct sk_buff *skb)
 {
         struct packet_type *ptype, *pt_prev;
+        rx_handler_func_t *rx_handler;
         struct net_device *orig_dev;
         struct net_device *master;
         struct net_device *null_or_orig;
@@ -2849,8 +2857,7 @@ static int __netif_receive_skb(struct sk_buff *skb)
                         skb->dev = master;
         }
 
-        __get_cpu_var(softnet_data).processed++;
-
+        __this_cpu_inc(softnet_data.processed);
         skb_reset_network_header(skb);
         skb_reset_transport_header(skb);
         skb->mac_len = skb->network_header - skb->mac_header;
@@ -2882,12 +2889,17 @@ static int __netif_receive_skb(struct sk_buff *skb)
 ncls:
 #endif
 
-        skb = handle_bridge(skb, &pt_prev, &ret, orig_dev);
-        if (!skb)
-                goto out;
-        skb = handle_macvlan(skb, &pt_prev, &ret, orig_dev);
-        if (!skb)
-                goto out;
+        /* Handle special case of bridge or macvlan */
+        rx_handler = rcu_dereference(skb->dev->rx_handler);
+        if (rx_handler) {
+                if (pt_prev) {
+                        ret = deliver_skb(skb, pt_prev, orig_dev);
+                        pt_prev = NULL;
+                }
+                skb = rx_handler(skb);
+                if (!skb)
+                        goto out;
+        }
 
         /*
          * Make sure frames received on VLAN interfaces stacked on
@@ -2948,6 +2960,9 @@ int netif_receive_skb(struct sk_buff *skb)
         if (netdev_tstamp_prequeue)
                 net_timestamp_check(skb);
 
+        if (skb_defer_rx_timestamp(skb))
+                return NET_RX_SUCCESS;
+
 #ifdef CONFIG_RPS
         {
                 struct rps_dev_flow voidflow, *rflow = &voidflow;
@@ -3712,10 +3727,11 @@ void dev_seq_stop(struct seq_file *seq, void *v)
 
 static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
 {
-        const struct net_device_stats *stats = dev_get_stats(dev);
+        struct rtnl_link_stats64 temp;
+        const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
 
-        seq_printf(seq, "%6s: %7lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu "
-                   "%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n",
+        seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
+                   "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
                    dev->name, stats->rx_bytes, stats->rx_packets,
                    stats->rx_errors,
                    stats->rx_dropped + stats->rx_missed_errors,
@@ -5264,20 +5280,22 @@ void netdev_run_todo(void)
 /**
  *      dev_txq_stats_fold - fold tx_queues stats
  *      @dev: device to get statistics from
- *      @stats: struct net_device_stats to hold results
+ *      @stats: struct rtnl_link_stats64 to hold results
  */
 void dev_txq_stats_fold(const struct net_device *dev,
-                        struct net_device_stats *stats)
+                        struct rtnl_link_stats64 *stats)
 {
-        unsigned long tx_bytes = 0, tx_packets = 0, tx_dropped = 0;
+        u64 tx_bytes = 0, tx_packets = 0, tx_dropped = 0;
         unsigned int i;
         struct netdev_queue *txq;
 
         for (i = 0; i < dev->num_tx_queues; i++) {
                 txq = netdev_get_tx_queue(dev, i);
+                spin_lock_bh(&txq->_xmit_lock);
                 tx_bytes   += txq->tx_bytes;
                 tx_packets += txq->tx_packets;
                 tx_dropped += txq->tx_dropped;
+                spin_unlock_bh(&txq->_xmit_lock);
         }
         if (tx_bytes || tx_packets || tx_dropped) {
                 stats->tx_bytes   = tx_bytes;
@@ -5287,23 +5305,53 @@ void dev_txq_stats_fold(const struct net_device *dev,
 }
 EXPORT_SYMBOL(dev_txq_stats_fold);
 
+/* 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)
+{
+#if BITS_PER_LONG == 64
+        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;
+        u64 *dst = (u64 *)stats64;
+
+        BUILD_BUG_ON(sizeof(*netdev_stats) / sizeof(unsigned long) !=
+                     sizeof(*stats64) / sizeof(u64));
+        for (i = 0; i < n; i++)
+                dst[i] = src[i];
+#endif
+}
+
 /**
  *      dev_get_stats   - get network device statistics
  *      @dev: device to get statistics from
+ *      @storage: place to store stats
  *
- *      Get network statistics from device. The device driver may provide
- *      its own method by setting dev->netdev_ops->get_stats; otherwise
- *      the internal statistics structure is used.
+ *      Get network statistics from device. Return @storage.
+ *      The device driver may provide its own method by setting
+ *      dev->netdev_ops->get_stats64 or dev->netdev_ops->get_stats;
+ *      otherwise the internal statistics structure is used.
  */
-const struct net_device_stats *dev_get_stats(struct net_device *dev)
+struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
+                                        struct rtnl_link_stats64 *storage)
 {
         const struct net_device_ops *ops = dev->netdev_ops;
 
-        if (ops->ndo_get_stats)
-                return ops->ndo_get_stats(dev);
-
-        dev_txq_stats_fold(dev, &dev->stats);
-        return &dev->stats;
+        if (ops->ndo_get_stats64) {
+                memset(storage, 0, sizeof(*storage));
+                return ops->ndo_get_stats64(dev, storage);
+        }
+        if (ops->ndo_get_stats) {
+                netdev_stats_to_stats64(storage, ops->ndo_get_stats(dev));
+                return storage;
+        }
+        netdev_stats_to_stats64(storage, &dev->stats);
+        dev_txq_stats_fold(dev, storage);
+        return storage;
 }
 EXPORT_SYMBOL(dev_get_stats);
 
@@ -5808,6 +5856,68 @@ char *netdev_drivername(const struct net_device *dev, char *buffer, int len)
         return buffer;
 }
 
+static int __netdev_printk(const char *level, const struct net_device *dev,
+                           struct va_format *vaf)
+{
+        int r;
+
+        if (dev && dev->dev.parent)
+                r = dev_printk(level, dev->dev.parent, "%s: %pV",
+                               netdev_name(dev), vaf);
+        else if (dev)
+                r = printk("%s%s: %pV", level, netdev_name(dev), vaf);
+        else
+                r = printk("%s(NULL net_device): %pV", level, vaf);
+
+        return r;
+}
+
+int netdev_printk(const char *level, const struct net_device *dev,
+                  const char *format, ...)
+{
+        struct va_format vaf;
+        va_list args;
+        int r;
+
+        va_start(args, format);
+
+        vaf.fmt = format;
+        vaf.va = &args;
+
+        r = __netdev_printk(level, dev, &vaf);
+        va_end(args);
+
+        return r;
+}
+EXPORT_SYMBOL(netdev_printk);
+
+#define define_netdev_printk_level(func, level)                 \
+int func(const struct net_device *dev, const char *fmt, ...)    \
+{                                                               \
+        int r;                                                  \
+        struct va_format vaf;                                   \
+        va_list args;                                           \
+                                                                \
+        va_start(args, fmt);                                    \
+                                                                \
+        vaf.fmt = fmt;                                          \
+        vaf.va = &args;                                         \
+                                                                \
+        r = __netdev_printk(level, dev, &vaf);                  \
+        va_end(args);                                           \
+                                                                \
+        return r;                                               \
+}                                                               \
+EXPORT_SYMBOL(func);
+
+define_netdev_printk_level(netdev_emerg, KERN_EMERG);
+define_netdev_printk_level(netdev_alert, KERN_ALERT);
+define_netdev_printk_level(netdev_crit, KERN_CRIT);
+define_netdev_printk_level(netdev_err, KERN_ERR);
+define_netdev_printk_level(netdev_warn, KERN_WARNING);
+define_netdev_printk_level(netdev_notice, KERN_NOTICE);
+define_netdev_printk_level(netdev_info, KERN_INFO);
+
 static void __net_exit netdev_exit(struct net *net)
 {
         kfree(net->dev_name_head);