redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

slcan: remove unused 'leased', 'line' and 'pid' fields from the 'slcan' structure

Browse source 
Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matvejchikov Ilya 2011-07-18 21:58:48 +00:00 committed by David S. Miller
parent a9481a38b1
commit 7ad711b49e
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/can/slcan.c
View file

@ -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);