Skip to content

Commit

Permalink
net/can/mscan: add listen only mode
Browse files Browse the repository at this point in the history
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Marc Kleine-Budde authored and David S. Miller committed Nov 14, 2011
1 parent 8b5c171 commit 452448f
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/net/can/mscan/mscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 452448f

Please sign in to comment.