From 20a853faf9e6ac8c6083546f9f126321da3ca1f3 Mon Sep 17 00:00:00 2001 From: Matvejchikov Ilya Date: Mon, 18 Jul 2011 21:56:44 +0000 Subject: [PATCH] --- yaml --- r: 256518 b: refs/heads/master c: a9481a38b1474aab0f686b30e4e2b57880065ad2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/slip.c | 3 --- trunk/drivers/net/slip.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ea24ceb8ff2e..b37de0dfa21b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd99beb9375b44309d5ed9c2b62063e23151610b +refs/heads/master: a9481a38b1474aab0f686b30e4e2b57880065ad2 diff --git a/trunk/drivers/net/slip.c b/trunk/drivers/net/slip.c index 8befe697bd76..f11b3f3df24f 100644 --- a/trunk/drivers/net/slip.c +++ b/trunk/drivers/net/slip.c @@ -807,7 +807,6 @@ static int slip_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)) { @@ -874,8 +873,6 @@ static void slip_close(struct tty_struct *tty) tty->disc_data = NULL; sl->tty = NULL; - if (!sl->leased) - sl->line = 0; /* VSV = very important to remove timers */ #ifdef CONFIG_SLIP_SMART diff --git a/trunk/drivers/net/slip.h b/trunk/drivers/net/slip.h index 914e958abbfc..aa0764ce2342 100644 --- a/trunk/drivers/net/slip.h +++ b/trunk/drivers/net/slip.h @@ -90,7 +90,6 @@ struct slip { unsigned char mode; /* SLIP mode */ unsigned char leased; - dev_t line; pid_t pid; #define SL_MODE_SLIP 0 #define SL_MODE_CSLIP 1