From 0332373f10df4cd30e208017909484377f9314f5 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Tue, 6 May 2008 19:41:48 +0100
Subject: [PATCH] --- yaml --- r: 98545 b: refs/heads/master c:
 3e3cda96d014b69f7723d1d4507897e5be6aceb7 h: refs/heads/master i:   98543:
 b49f52a98361d4109624b62fe79c38cafdce4ce9 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/wan/x25_asy.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a31b83f67193..754e497c493c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c81ec80bc86f4eacd5f48229c1de623865acbb92
+refs/heads/master: 3e3cda96d014b69f7723d1d4507897e5be6aceb7
diff --git a/trunk/drivers/net/wan/x25_asy.c b/trunk/drivers/net/wan/x25_asy.c
index 249e18053d5f..069f8bb0a99f 100644
--- a/trunk/drivers/net/wan/x25_asy.c
+++ b/trunk/drivers/net/wan/x25_asy.c
@@ -32,6 +32,7 @@
 #include <linux/x25.h>
 #include <linux/lapb.h>
 #include <linux/init.h>
+#include <linux/rtnetlink.h>
 #include "x25_asy.h"
 
 #include <net/x25device.h>
@@ -601,8 +602,10 @@ static void x25_asy_close_tty(struct tty_struct *tty)
 	if (!sl || sl->magic != X25_ASY_MAGIC)
 		return;
 
+	rtnl_lock();
 	if (sl->dev->flags & IFF_UP)
 		dev_close(sl->dev);
+	rtnl_unlock();
 
 	tty->disc_data = NULL;
 	sl->tty = NULL;