Subject: [PATCH] can: ems_usb: removed duplicated code setting local echo support

Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>
---
drivers/net/can/usb/ems_usb.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index efbb05c..ee849cf 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -1020,8 +1020,6 @@ static int ems_usb_probe(struct usb_interface *intf,
dev->can.do_set_bittiming = ems_usb_set_bittiming;
dev->can.do_set_mode = ems_usb_set_mode;

- netdev->flags |= IFF_ECHO; /* we support local echo */
-
netdev->netdev_ops = &ems_usb_netdev_ops;

netdev->flags |= IFF_ECHO; /* we support local echo */
--
1.6.6.1


2010-02-04 04:32:47

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] can: ems_usb: removed duplicated code setting local echo support

From: Thadeu Lima de Souza Cascardo <[email protected]>
Date: Mon, 1 Feb 2010 16:02:06 -0200

> Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

This doesn't apply to net-next-2.6

Subject: [PATCH] can: ems_usb: removed duplicated code setting local echo support

Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>
---
drivers/net/can/usb/ems_usb.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
index bfab283..11c8784 100644
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@ -1024,8 +1024,6 @@ static int ems_usb_probe(struct usb_interface *intf,
dev->can.do_set_mode = ems_usb_set_mode;
dev->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;

- netdev->flags |= IFF_ECHO; /* we support local echo */
-
netdev->netdev_ops = &ems_usb_netdev_ops;

netdev->flags |= IFF_ECHO; /* we support local echo */
--
1.6.6.1

Subject: Re: [PATCH] can: ems_usb: removed duplicated code setting local echo support

On Wed, Feb 03, 2010 at 08:32:56PM -0800, David Miller wrote:
> From: Thadeu Lima de Souza Cascardo <[email protected]>
> Date: Mon, 1 Feb 2010 16:02:06 -0200
>
> > Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>
>
> This doesn't apply to net-next-2.6

I have just resent a version cherry-picked on top of its master branch.

Attachments:
(No filename) (357.00 B)
 signature.asc (198.00 B)
Digital signature Download all attachments

2010-02-04 17:21:29

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] can: ems_usb: removed duplicated code setting local echo support

From: Thadeu Lima de Souza Cascardo <[email protected]>
Date: Thu, 4 Feb 2010 13:33:44 -0200

> Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

Applied, thanks.