diff --git a/[refs] b/[refs]
index 529261ebe4d1..ea0663eb01d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b727361f0bc7ee7378298941066d8aa15023ffb
+refs/heads/master: 99f34b38cdc8f75a4b9adb5a617b118253b3efe1
diff --git a/trunk/drivers/net/macvtap.c b/trunk/drivers/net/macvtap.c
index 3da557830937..70aa628834f0 100644
--- a/trunk/drivers/net/macvtap.c
+++ b/trunk/drivers/net/macvtap.c
@@ -231,6 +231,8 @@ static void macvtap_del_queues(struct net_device *dev)
 		}
 	}
 	BUG_ON(vlan->numvtaps != 0);
+	/* guarantee that any future macvtap_set_queue will fail */
+	vlan->numvtaps = MAX_MACVTAP_QUEUES;
 	spin_unlock(&macvtap_lock);
 
 	synchronize_rcu();