---

yaml --- r: 155667 b: refs/heads/master c: 1b0d922 h: refs/heads/master i: 155665: 64d3fae 155663: 7a58d0e v: v3
git-mirror · Jul 20, 2009 · 3ca8917 · 3ca8917
1 parent 92a049f
commit 3ca8917
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;