From patchwork Wed Nov 9 20:50:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Kleine-Budde X-Patchwork-Id: 124700 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 433FDB6F7F for ; Thu, 10 Nov 2011 07:51:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932904Ab1KIUu4 (ORCPT ); Wed, 9 Nov 2011 15:50:56 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:60408 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932886Ab1KIUuz (ORCPT ); Wed, 9 Nov 2011 15:50:55 -0500 Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=hardanger.do.blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1ROF6k-0006nZ-5v; Wed, 09 Nov 2011 21:50:54 +0100 From: Marc Kleine-Budde To: linux-can@vger.kernel.org Cc: netdev@vger.kernel.org, davem@davemloft.net, Marc Kleine-Budde Subject: [PATCH] net/can/mscan: add listen only mode Date: Wed, 9 Nov 2011 21:50:49 +0100 Message-Id: <1320871849-24719-1-git-send-email-mkl@pengutronix.de> X-Mailer: git-send-email 1.7.4.1 X-SA-Exim-Connect-IP: 2001:6f8:1178:4:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds listen only mode to the mscan controller. Signed-off-by: Marc Kleine-Budde Acked-by: Wolfgang Grandegger --- 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(®s->canctl1, MSCAN_LISTEN); + if (ctrlmode.flags & CAN_CTRLMODE_LISTENONLY) + setbits8(®s->canctl1, MSCAN_LISTEN); + else + clrbits8(®s->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;