netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net/can/mscan: add listen only mode
@ 2011-11-03 13:00 Marc Kleine-Budde
  2011-11-09 15:52 ` Marc Kleine-Budde
  0 siblings, 1 reply; 5+ messages in thread
From: Marc Kleine-Budde @ 2011-11-03 13:00 UTC (permalink / raw)
  To: linux-can; +Cc: netdev, Marc Kleine-Budde

This patch adds listen only mode to the mscan controller.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---

...can be pulled via:

The following changes since commit 8b3408f8ee994973869d8ba32c5bf482bc4ddca4:

  dp83640: free packet queues on remove (2011-10-24 19:14:50 -0400)

are available in the git repository at:
  git://git.pengutronix.de/git/mkl/linux-2.6.git can/mscan-listen-only-for-net-next

Marc Kleine-Budde (1):
      net/can/mscan: add listen only mode

 drivers/net/can/mscan/mscan.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index ec4a311..74f3b18 100644
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -581,7 +581,10 @@ static int mscan_open(struct net_device *dev)
 
 	priv->open_time = jiffies;
 
-	clrbits8(&regs->canctl1, MSCAN_LISTEN);
+	if (ctrlmode.flags & CAN_CTRLMODE_LISTENONLY)
+		setbits8(&regs->canctl1, MSCAN_LISTEN);
+	else
+		clrbits8(&regs->canctl1, MSCAN_LISTEN);
 
 	ret = mscan_start(dev);
 	if (ret)
@@ -690,7 +693,8 @@ struct net_device *alloc_mscandev(void)
 	priv->can.bittiming_const = &mscan_bittiming_const;
 	priv->can.do_set_bittiming = mscan_do_set_bittiming;
 	priv->can.do_set_mode = mscan_do_set_mode;
-	priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
+	priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |
+		CAN_CTRLMODE_LISTENONLY;
 
 	for (i = 0; i < TX_QUEUE_SIZE; i++) {
 		priv->tx_queue[i].id = i;
-- 
1.7.4.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] net/can/mscan: add listen only mode
  2011-11-03 13:00 [PATCH] net/can/mscan: add listen only mode Marc Kleine-Budde
@ 2011-11-09 15:52 ` Marc Kleine-Budde
  2011-11-09 16:01   ` Wolfgang Grandegger
  0 siblings, 1 reply; 5+ messages in thread
From: Marc Kleine-Budde @ 2011-11-09 15:52 UTC (permalink / raw)
  To: Marc Kleine-Budde; +Cc: linux-can, netdev

[-- Attachment #1: Type: text/plain, Size: 2002 bytes --]

On 11/03/2011 02:00 PM, Marc Kleine-Budde wrote:
> This patch adds listen only mode to the mscan controller.
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

ping, any comments?

Marc
> ---
> 
> ...can be pulled via:
> 
> The following changes since commit 8b3408f8ee994973869d8ba32c5bf482bc4ddca4:
> 
>   dp83640: free packet queues on remove (2011-10-24 19:14:50 -0400)
> 
> are available in the git repository at:
>   git://git.pengutronix.de/git/mkl/linux-2.6.git can/mscan-listen-only-for-net-next
> 
> Marc Kleine-Budde (1):
>       net/can/mscan: add listen only mode
> 
>  drivers/net/can/mscan/mscan.c |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
> index ec4a311..74f3b18 100644
> --- a/drivers/net/can/mscan/mscan.c
> +++ b/drivers/net/can/mscan/mscan.c
> @@ -581,7 +581,10 @@ static int mscan_open(struct net_device *dev)
>  
>  	priv->open_time = jiffies;
>  
> -	clrbits8(&regs->canctl1, MSCAN_LISTEN);
> +	if (ctrlmode.flags & CAN_CTRLMODE_LISTENONLY)
> +		setbits8(&regs->canctl1, MSCAN_LISTEN);
> +	else
> +		clrbits8(&regs->canctl1, MSCAN_LISTEN);
>  
>  	ret = mscan_start(dev);
>  	if (ret)
> @@ -690,7 +693,8 @@ struct net_device *alloc_mscandev(void)
>  	priv->can.bittiming_const = &mscan_bittiming_const;
>  	priv->can.do_set_bittiming = mscan_do_set_bittiming;
>  	priv->can.do_set_mode = mscan_do_set_mode;
> -	priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
> +	priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |
> +		CAN_CTRLMODE_LISTENONLY;
>  
>  	for (i = 0; i < TX_QUEUE_SIZE; i++) {
>  		priv->tx_queue[i].id = i;


-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] net/can/mscan: add listen only mode
  2011-11-09 15:52 ` Marc Kleine-Budde
@ 2011-11-09 16:01   ` Wolfgang Grandegger
  0 siblings, 0 replies; 5+ messages in thread
From: Wolfgang Grandegger @ 2011-11-09 16:01 UTC (permalink / raw)
  To: Marc Kleine-Budde; +Cc: linux-can, netdev

On 11/09/2011 04:52 PM, Marc Kleine-Budde wrote:
> On 11/03/2011 02:00 PM, Marc Kleine-Budde wrote:
>> This patch adds listen only mode to the mscan controller.
>>
>> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> 
> ping, any comments?

Looks good, therefore:

Acked-by: Wolfgang Grandegger <wg@grandegger.com>

Thanks,

Wolfgang.

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] net/can/mscan: add listen only mode
  2011-11-09 20:50 Marc Kleine-Budde
@ 2011-11-14  5:51 ` David Miller
  0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2011-11-14  5:51 UTC (permalink / raw)
  To: mkl; +Cc: linux-can, netdev

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed,  9 Nov 2011 21:50:49 +0100

> This patch adds listen only mode to the mscan controller.
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Acked-by: Wolfgang Grandegger <wg@grandegger.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH] net/can/mscan: add listen only mode
@ 2011-11-09 20:50 Marc Kleine-Budde
  2011-11-14  5:51 ` David Miller
  0 siblings, 1 reply; 5+ messages in thread
From: Marc Kleine-Budde @ 2011-11-09 20:50 UTC (permalink / raw)
  To: linux-can; +Cc: netdev, davem, Marc Kleine-Budde

This patch adds listen only mode to the mscan controller.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Acked-by: Wolfgang Grandegger <wg@grandegger.com>
---

The patch targets net-next/master and can be pulled:

The following changes since commit e56c57d0d3fdbbdf583d3af96bfb803b8dfa713e:

  net: rename sk_clone to sk_clone_lock (2011-11-08 17:07:07 -0500)

are available in the git repository at:
  git://git.pengutronix.de/git/mkl/linux-2.6.git can/mscan-listen-only-for-net-next

Marc Kleine-Budde (1):
      net/can/mscan: add listen only mode

 drivers/net/can/mscan/mscan.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index ec4a311..74f3b18 100644
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -581,7 +581,10 @@ static int mscan_open(struct net_device *dev)
 
 	priv->open_time = jiffies;
 
-	clrbits8(&regs->canctl1, MSCAN_LISTEN);
+	if (ctrlmode.flags & CAN_CTRLMODE_LISTENONLY)
+		setbits8(&regs->canctl1, MSCAN_LISTEN);
+	else
+		clrbits8(&regs->canctl1, MSCAN_LISTEN);
 
 	ret = mscan_start(dev);
 	if (ret)
@@ -690,7 +693,8 @@ struct net_device *alloc_mscandev(void)
 	priv->can.bittiming_const = &mscan_bittiming_const;
 	priv->can.do_set_bittiming = mscan_do_set_bittiming;
 	priv->can.do_set_mode = mscan_do_set_mode;
-	priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;
+	priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |
+		CAN_CTRLMODE_LISTENONLY;
 
 	for (i = 0; i < TX_QUEUE_SIZE; i++) {
 		priv->tx_queue[i].id = i;
-- 
1.7.4.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-11-14  5:51 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-03 13:00 [PATCH] net/can/mscan: add listen only mode Marc Kleine-Budde
2011-11-09 15:52 ` Marc Kleine-Budde
2011-11-09 16:01   ` Wolfgang Grandegger
2011-11-09 20:50 Marc Kleine-Budde
2011-11-14  5:51 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).