Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / drivers / net / macvtap.c

diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 7869b0651576fa6432b9608adb906fc7e1fccd26..52a9d811be06459251f197c34a88c415d4bf7e6b 100644 (file)
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -437,7 +437,7 @@ static int macvtap_get_minor(struct macvlan_dev *vlan)
        if (retval >= 0) {
                vlan->minor = retval;
        } else if (retval == -ENOSPC) {
-               printk(KERN_ERR "too many macvtap devices\n");
+               netdev_err(vlan->dev, "Too many macvtap devices\n");
                retval = -EINVAL;
        }
        mutex_unlock(&minor_lock);
@@ -826,9 +826,8 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
                if (iov_iter_count(iter) < vnet_hdr_len)
                        return -EINVAL;
 
-               ret = virtio_net_hdr_from_skb(skb, &vnet_hdr,
-                                             macvtap_is_little_endian(q));
-               if (ret)
+               if (virtio_net_hdr_from_skb(skb, &vnet_hdr,
+                                           macvtap_is_little_endian(q)))
                        BUG();
 
                if (copy_to_iter(&vnet_hdr, sizeof(vnet_hdr), iter) !=