aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/net/can/dev.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2019-09-05 11:40:54 +0200
committerLinus Walleij <linus.walleij@linaro.org>2019-09-05 11:40:54 +0200
commit151a41014bff92f353263cadc051435dc9c3258e (patch)
treeaa082a0745edd5b7051668f455dfc0ee1e4a9de0 /drivers/net/can/dev.c
parentgpio: Fix up merge collision in include file (diff)
parentLinux 5.3-rc7 (diff)
downloadwireguard-linux-151a41014bff92f353263cadc051435dc9c3258e.tar.xz
wireguard-linux-151a41014bff92f353263cadc051435dc9c3258e.zip
Merge tag 'v5.3-rc7' into devel
Linux 5.3-rc7
Diffstat (limited to '')
-rw-r--r--drivers/net/can/dev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index b6b93a2d93a5..483d270664cc 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -1249,6 +1249,8 @@ int register_candev(struct net_device *dev)
return -EINVAL;
dev->rtnl_link_ops = &can_link_ops;
+ netif_carrier_off(dev);
+
return register_netdev(dev);
}
EXPORT_SYMBOL_GPL(register_candev);