From 3ca8917a795db0d359af3567bf4f979158448ebe Mon Sep 17 00:00:00 2001
From: Wolfgang Grandegger <wg@grandegger.com>
Date: Mon, 20 Jul 2009 04:06:41 +0000
Subject: [PATCH] --- yaml --- r: 155667 b: refs/heads/master c:
 1b0d92244ff2434a98272f6d2525da32fc230f19 h: refs/heads/master i:   155665:
 64d3fae90352aa0f212720e6cafe749f2c6e6f6b   155663:
 7a58d0e81f6fb5b74a271bbdebcf607d9b9d95fa v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/can/dev.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 27cdc0e59acc..06e60d7aa436 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3d0df7ca35018ebbc24fd102ed7021cf593ba74
+refs/heads/master: 1b0d92244ff2434a98272f6d2525da32fc230f19
diff --git a/trunk/drivers/net/can/dev.c b/trunk/drivers/net/can/dev.c
index 06083c32869a..9e4283aff828 100644
--- a/trunk/drivers/net/can/dev.c
+++ b/trunk/drivers/net/can/dev.c
@@ -473,6 +473,10 @@ int open_candev(struct net_device *dev)
 		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;