From 698f560bff5370ae3d3f6499cb0339809781b2b4 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 27 Apr 2009 03:23:54 -0700 Subject: [PATCH] --- yaml --- r: 150032 b: refs/heads/master c: f85ba78068ac137fe9c1f50d25405d2783d75c77 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tun.c | 2 ++ trunk/include/linux/if_tun.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 47da0507b7d0..aa34a52a8e12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0456b4f8b742006c2b79fcbe6b0736aa1ad39180 +refs/heads/master: f85ba78068ac137fe9c1f50d25405d2783d75c77 diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c index 589f0ca668d6..94622e5fb936 100644 --- a/trunk/drivers/net/tun.c +++ b/trunk/drivers/net/tun.c @@ -874,6 +874,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) dev = __dev_get_by_name(net, ifr->ifr_name); if (dev) { + if (ifr->ifr_flags & IFF_TUN_EXCL) + return -EBUSY; if ((ifr->ifr_flags & IFF_TUN) && dev->netdev_ops == &tun_netdev_ops) tun = netdev_priv(dev); else if ((ifr->ifr_flags & IFF_TAP) && dev->netdev_ops == &tap_netdev_ops) diff --git a/trunk/include/linux/if_tun.h b/trunk/include/linux/if_tun.h index 049d6c9428db..915ba5789f0e 100644 --- a/trunk/include/linux/if_tun.h +++ b/trunk/include/linux/if_tun.h @@ -55,6 +55,7 @@ #define IFF_NO_PI 0x1000 #define IFF_ONE_QUEUE 0x2000 #define IFF_VNET_HDR 0x4000 +#define IFF_TUN_EXCL 0x8000 /* Features for GSO (TUNSETOFFLOAD). */ #define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */