diff options
| author | Wolfgang Grandegger <wg@grandegger.com> | 2009-07-20 04:06:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-20 12:28:30 -0700 |
| commit | 1b0d92244ff2434a98272f6d2525da32fc230f19 (patch) | |
| tree | 71ab998e48c94b1d67729da22051b8e24cc59258 /drivers/net | |
| parent | b3d0df7ca35018ebbc24fd102ed7021cf593ba74 (diff) | |
| download | kernel-crypto-1b0d92244ff2434a98272f6d2525da32fc230f19.tar.gz kernel-crypto-1b0d92244ff2434a98272f6d2525da32fc230f19.tar.xz kernel-crypto-1b0d92244ff2434a98272f6d2525da32fc230f19.zip | |
can: switch carrier on if device was stopped while in bus-off state
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 <kurt.van.dijck@skynet.be>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/dev.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 06083c32869..9e4283aff82 100644 --- a/drivers/net/can/dev.c +++ b/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; |