Patchwork slip: remove unused 'line' field from the 'slip' structure

login
register
mail settings
Submitter Matvejchikov Ilya
Date July 19, 2011, 7:56 a.m.
Message ID <CAKh5nabuWJtnfM6PEOkGbEog89jmiAAiPPArV==2F5mX0PUH-Q@mail.gmail.com>
Download mbox | patch
Permalink /patch/105401/
State Accepted
Delegated to: David Miller
Headers show

Comments

Matvejchikov Ilya - July 19, 2011, 7:56 a.m.
Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com>
---
 drivers/net/slip.c |    3 ---
 drivers/net/slip.h |    1 -
 2 files changed, 0 insertions(+), 4 deletions(-)
David Miller - July 19, 2011, 11:55 p.m.
From: Matvejchikov Ilya <matvejchikov@gmail.com>
Date: Tue, 19 Jul 2011 11:56:44 +0400

> Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 2f110fb..77c4798 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -823,7 +823,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)) {
@@ -890,8 +889,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/drivers/net/slip.h b/drivers/net/slip.h
index 914e958..aa0764c 100644
--- a/drivers/net/slip.h
+++ b/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