From patchwork Mon Jul 20 14:06:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Grandegger X-Patchwork-Id: 30009 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 30F8FB7080 for ; Tue, 21 Jul 2009 00:07:00 +1000 (EST) Received: by ozlabs.org (Postfix) id 24CB6DDDA0; Tue, 21 Jul 2009 00:07:00 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 82DFCDDD04 for ; Tue, 21 Jul 2009 00:06:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753963AbZGTOGn (ORCPT ); Mon, 20 Jul 2009 10:06:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753949AbZGTOGm (ORCPT ); Mon, 20 Jul 2009 10:06:42 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:45614 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753822AbZGTOGk (ORCPT ); Mon, 20 Jul 2009 10:06:40 -0400 Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id 5CF7B1C001E0; Mon, 20 Jul 2009 16:06:39 +0200 (CEST) X-Auth-Info: 7zRkh4S09keZ23P0ZsSJDkru7DQk7z1Q3+5u+NKeilo= Received: from mail.denx.de (host-82-135-33-74.customer.m-online.net [82.135.33.74]) by smtp-auth.mnet-online.de (Postfix) with ESMTP id 4AB019026B; Mon, 20 Jul 2009 16:06:39 +0200 (CEST) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail.denx.de (Postfix) with ESMTP id 156774104AC7; Mon, 20 Jul 2009 16:06:39 +0200 (CEST) Received: by pollux.denx.de (Postfix, from userid 504) id 0BD2D10117BB1; Mon, 20 Jul 2009 16:06:39 +0200 (CEST) Message-Id: <20090720140638.910228137@denx.de> User-Agent: quilt/0.47-1 Date: Mon, 20 Jul 2009 16:06:41 +0200 From: Wolfgang Grandegger To: netdev@vger.kernel.org Cc: socketcan-core@lists.berlios.de, Kurt Van Dijck , Wolfgang Grandegger Subject: [PATCH 3/3] can: switch carrier on if device was stopped while in bus-off state References: <20090720140638.342067093@denx.de> Content-Disposition: inline; filename=can-bus-off-carrier.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes a problem when a device is stopped while in the bus-off state. Then the carrier remains off forever. Signed-off-by: Kurt Van Dijck Signed-off-by: Wolfgang Grandegger --- drivers/net/can/dev.c | 4 ++++ 1 file changed, 4 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: net-next-2.6/drivers/net/can/dev.c =================================================================== --- net-next-2.6.orig/drivers/net/can/dev.c 2009-07-20 16:03:35.083997416 +0200 +++ net-next-2.6/drivers/net/can/dev.c 2009-07-20 16:03:35.100998431 +0200 @@ -473,6 +473,10 @@ return -EINVAL; } + /* Switch carrier on if device was stopped while in bus-off state */ + if (!netif_carrier_ok(dev)) + netif_carrier_on(dev); + setup_timer(&priv->restart_timer, can_restart, (unsigned long)dev); return 0;