aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatvejchikov Ilya <matvejchikov@gmail.com>2011-07-18 17:56:44 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-19 19:55:42 -0400
commita9481a38b1474aab0f686b30e4e2b57880065ad2 (patch)
tree9ef351656f8542fbcae3098bb0a173fb5f91cb78
parentfd99beb9375b44309d5ed9c2b62063e23151610b (diff)
slip: remove unused 'line' field from the 'slip' structure
Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/slip.c3
-rw-r--r--drivers/net/slip.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 8befe697bd76..f11b3f3df24f 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -807,7 +807,6 @@ static int slip_open(struct tty_struct *tty)
807 807
808 sl->tty = tty; 808 sl->tty = tty;
809 tty->disc_data = sl; 809 tty->disc_data = sl;
810 sl->line = tty_devnum(tty);
811 sl->pid = current->pid; 810 sl->pid = current->pid;
812 811
813 if (!test_bit(SLF_INUSE, &sl->flags)) { 812 if (!test_bit(SLF_INUSE, &sl->flags)) {
@@ -874,8 +873,6 @@ static void slip_close(struct tty_struct *tty)
874 873
875 tty->disc_data = NULL; 874 tty->disc_data = NULL;
876 sl->tty = NULL; 875 sl->tty = NULL;
877 if (!sl->leased)
878 sl->line = 0;
879 876
880 /* VSV = very important to remove timers */ 877 /* VSV = very important to remove timers */
881#ifdef CONFIG_SLIP_SMART 878#ifdef CONFIG_SLIP_SMART
diff --git a/drivers/net/slip.h b/drivers/net/slip.h
index 914e958abbfc..aa0764ce2342 100644
--- a/drivers/net/slip.h
+++ b/drivers/net/slip.h
@@ -90,7 +90,6 @@ struct slip {
90 90
91 unsigned char mode; /* SLIP mode */ 91 unsigned char mode; /* SLIP mode */
92 unsigned char leased; 92 unsigned char leased;
93 dev_t line;
94 pid_t pid; 93 pid_t pid;
95#define SL_MODE_SLIP 0 94#define SL_MODE_SLIP 0
96#define SL_MODE_CSLIP 1 95#define SL_MODE_CSLIP 1