From f81d5832e1ac40e126a30d1ffe182e2b6df04811 Mon Sep 17 00:00:00 2001
From: Matvejchikov Ilya <matvejchikov@gmail.com>
Date: Mon, 18 Jul 2011 21:58:48 +0000
Subject: [PATCH] --- yaml --- r: 256519 b: refs/heads/master c:
 7ad711b49e661a0979ed1a84bed16bc9fa7f872b h: refs/heads/master i:   256517:
 f673a6c24f3e327d810df6f5e094390ecd7343b8   256515:
 3af28b257d2aa99a801963eddb8347b5ae029d4f   256511:
 910d986cd669dbb16f8cac65c92b26003dbc75c7 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/net/can/slcan.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index b37de0dfa21b..ed5e68b2baa8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9481a38b1474aab0f686b30e4e2b57880065ad2
+refs/heads/master: 7ad711b49e661a0979ed1a84bed16bc9fa7f872b
diff --git a/trunk/drivers/net/can/slcan.c b/trunk/drivers/net/can/slcan.c
index 65e54fd0a8d7..f523f1cc5142 100644
--- a/trunk/drivers/net/can/slcan.c
+++ b/trunk/drivers/net/can/slcan.c
@@ -96,10 +96,6 @@ struct slcan {
 	unsigned long		flags;		/* Flag values/ mode etc     */
 #define SLF_INUSE		0		/* Channel in use            */
 #define SLF_ERROR		1               /* Parity, etc. error        */
-
-	unsigned char		leased;
-	dev_t			line;
-	pid_t			pid;
 };
 
 static struct net_device **slcan_devs;
@@ -446,7 +442,7 @@ static void slc_sync(void)
 			break;
 
 		sl = netdev_priv(dev);
-		if (sl->tty || sl->leased)
+		if (sl->tty)
 			continue;
 		if (dev->flags & IFF_UP)
 			dev_close(dev);
@@ -534,8 +530,6 @@ static int slcan_open(struct tty_struct *tty)
 
 	sl->tty = tty;
 	tty->disc_data = sl;
-	sl->line = tty_devnum(tty);
-	sl->pid = current->pid;
 
 	if (!test_bit(SLF_INUSE, &sl->flags)) {
 		/* Perform the low-level SLCAN initialization. */
@@ -586,8 +580,6 @@ static void slcan_close(struct tty_struct *tty)
 
 	tty->disc_data = NULL;
 	sl->tty = NULL;
-	if (!sl->leased)
-		sl->line = 0;
 
 	/* Flush network side */
 	unregister_netdev(sl->dev);