| Submitter | Matvejchikov Ilya |
|---|---|
| Date | July 19, 2011, 7:58 a.m. |
| Message ID | <CAKh5naa=x13=wUE+MLAYv0XQ4OhuY5G47ZDmFz0vbkibNtoz-A@mail.gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/105402/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
On 19.07.2011 09:58, Matvejchikov Ilya wrote: > Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com> > --- Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> Thanks Ilya! Your cleanup is obviously fixing some fallout from this patch http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=5342b77c4123ba39f911d92a813295fb3bb21f69 which emerged in 2.6.32 for slip.c . Best regards, Oliver > 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 1b49df6..805ee29 100644 > --- a/drivers/net/can/slcan.c > +++ b/drivers/net/can/slcan.c > @@ -95,10 +95,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; > @@ -462,7 +458,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); > @@ -565,8 +561,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. */ > @@ -617,8 +611,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); -- 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
Well, it seems that it is. 2011/7/19 Oliver Hartkopp <socketcan@hartkopp.net>: > On 19.07.2011 09:58, Matvejchikov Ilya wrote: >> Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com> >> --- > > Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> > > Thanks Ilya! > > Your cleanup is obviously fixing some fallout from this patch > > http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=5342b77c4123ba39f911d92a813295fb3bb21f69 > > which emerged in 2.6.32 for slip.c . > > Best regards, > Oliver > > >> 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 1b49df6..805ee29 100644 >> --- a/drivers/net/can/slcan.c >> +++ b/drivers/net/can/slcan.c >> @@ -95,10 +95,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; >> @@ -462,7 +458,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); >> @@ -565,8 +561,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. */ >> @@ -617,8 +611,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); > > -- 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
From: Matvejchikov Ilya <matvejchikov@gmail.com> Date: Tue, 19 Jul 2011 11:58:48 +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/can/slcan.c b/drivers/net/can/slcan.c index 1b49df6..805ee29 100644 --- a/drivers/net/can/slcan.c +++ b/drivers/net/can/slcan.c @@ -95,10 +95,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; @@ -462,7 +458,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); @@ -565,8 +561,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. */ @@ -617,8 +611,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);
Signed-off-by: Matvejchikov Ilya <matvejchikov@gmail.com> --- drivers/net/can/slcan.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-)