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

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/net/ethernet/emulex/benet/be.h
	include/net/tcp.h
	net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 66109a2ad886..f042b0373e5d 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1471,14 +1471,17 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
         if (!tun)
                 return -EBADFD;
 
-        if (flags & ~(MSG_DONTWAIT|MSG_TRUNC))
-                return -EINVAL;
+        if (flags & ~(MSG_DONTWAIT|MSG_TRUNC)) {
+                ret = -EINVAL;
+                goto out;
+        }
         ret = tun_do_read(tun, tfile, iocb, m->msg_iov, total_len,
                           flags & MSG_DONTWAIT);
         if (ret > total_len) {
                 m->msg_flags |= MSG_TRUNC;
                 ret = flags & MSG_TRUNC ? ret : total_len;
         }
+out:
         tun_put(tun);
         return ret;
 }
@@ -1593,8 +1596,12 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                         return err;
 
                 if (tun->flags & TUN_TAP_MQ &&
-                    (tun->numqueues + tun->numdisabled > 1))
-                        return -EBUSY;
+                    (tun->numqueues + tun->numdisabled > 1)) {
+                        /* One or more queue has already been attached, no need
+                         * to initialize the device again.
+                         */
+                        return 0;
+                }
         }
         else {
                 char *name;