diff options
| author | Matvejchikov Ilya <matvejchikov@gmail.com> | 2011-07-18 21:58:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-19 16:55:42 -0700 |
| commit | 7ad711b49e661a0979ed1a84bed16bc9fa7f872b (patch) | |
| tree | c00d8448d17f627d026e525643fa3bfb466fb5fb /drivers/net/can | |
| parent | a9481a38b1474aab0f686b30e4e2b57880065ad2 (diff) | |
| download | op-kernel-dev-7ad711b49e661a0979ed1a84bed16bc9fa7f872b.zip op-kernel-dev-7ad711b49e661a0979ed1a84bed16bc9fa7f872b.tar.gz | |
slcan: remove unused 'leased', 'line' and 'pid' fields from the 'slcan' structure
Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/slcan.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c index 65e54fd..f523f1c 100644 --- a/drivers/net/can/slcan.c +++ b/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); |
