diff --git a/[refs] b/[refs]
index 3eebb1e205a5..039c86a18fc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccf9b3b83d0e56fbf20c00a08b15031ce13204a7
+refs/heads/master: e35259a95331ae4a9146cc03ab49aad641cab957
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 7ab94c825b57..b9018bfa0a97 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -602,6 +602,12 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 	tun->attached = 1;
 	get_net(dev_net(tun->dev));
 
+	/* Make sure persistent devices do not get stuck in
+	 * xoff state.
+	 */
+	if (netif_running(tun->dev))
+		netif_wake_queue(tun->dev);
+
 	strcpy(ifr->ifr_name, tun->dev->name);
 	return 0;