From patchwork Wed Oct 29 10:45:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 5187031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 501469F349 for ; Wed, 29 Oct 2014 11:55:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 80D56201CD for ; Wed, 29 Oct 2014 11:55:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8E3E20179 for ; Wed, 29 Oct 2014 11:55:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XjRnl-0002Ys-Qh; Wed, 29 Oct 2014 11:52:33 +0000 Received: from mail-bn1bbn0106.outbound.protection.outlook.com ([157.56.111.106] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XjRnH-0002Nd-3R for linux-arm-kernel@lists.infradead.org; Wed, 29 Oct 2014 11:52:03 +0000 Received: from CO2PR03CA0016.namprd03.prod.outlook.com (10.141.194.143) by DM2PR03MB335.namprd03.prod.outlook.com (10.141.54.20) with Microsoft SMTP Server (TLS) id 15.1.11.9; Wed, 29 Oct 2014 11:51:45 +0000 Received: from BY2FFO11FD003.protection.gbl (2a01:111:f400:7c0c::144) by CO2PR03CA0016.outlook.office365.com (2a01:111:e400:1414::15) with Microsoft SMTP Server (TLS) id 15.1.11.14 via Frontend Transport; Wed, 29 Oct 2014 11:51:44 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD003.mail.protection.outlook.com (10.1.14.125) with Microsoft SMTP Server (TLS) id 15.0.1049.20 via Frontend Transport; Wed, 29 Oct 2014 11:51:44 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s9TBpOFO024329; Wed, 29 Oct 2014 04:51:39 -0700 From: Dong Aisheng To: Subject: [PATCH 5/7] can: clear ctrlmode when close candev Date: Wed, 29 Oct 2014 18:45:25 +0800 Message-ID: <1414579527-31100-5-git-send-email-b29396@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414579527-31100-1-git-send-email-b29396@freescale.com> References: <1414579527-31100-1-git-send-email-b29396@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(62966002)(77156001)(92566001)(50986999)(105606002)(229853001)(89996001)(106466001)(20776003)(47776003)(88136002)(50466002)(36756003)(85852003)(64706001)(87936001)(95666004)(4396001)(48376002)(93916002)(31966008)(92726001)(87286001)(2351001)(99396003)(76176999)(107046002)(50226001)(21056001)(120916001)(97736003)(33646002)(68736004)(85306004)(19580405001)(19580395003)(76482002)(44976005)(6806004)(110136001)(102836001)(104016003)(80022003)(26826002)(104166001)(46102003)(84676001)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR03MB335; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB335; X-Forefront-PRVS: 03793408BA Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=Aisheng.Dong@freescale.com; X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141029_045203_275645_A2BBA328 X-CRM114-Status: UNSURE ( 8.17 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: netdev@vger.kernel.org, varkabhadram@gmail.com, mkl@pengutronix.de, linux-arm-kernel@lists.infradead.org, socketcan@hartkopp.net, b29396@freescale.com, wg@grandegger.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently priv->ctrlmode is not cleared when close_candev, so next time the driver will still use this value to set controller even user does not set any ctrl mode. e.g. Step 1. ip link set can0 up type can0 bitrate 1000000 loopback on Controller will be in loopback mode Step 2. ip link set can0 down Step 3. ip link set can0 up type can0 bitrate 1000000 Controller will still be set to loopback mode in driver due to saved priv->ctrlmode. This patch clears priv->ctrlmode when the CAN interface is closed, and set it to correct mode according to next user setting. Signed-off-by: Dong Aisheng --- drivers/net/can/dev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 02492d2..1fce485 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -671,6 +671,7 @@ void close_candev(struct net_device *dev) del_timer_sync(&priv->restart_timer); can_flush_echo_skb(dev); + priv->ctrlmode = 0; } EXPORT_SYMBOL_GPL(close_candev);