diff options
author | David S. Miller <davem@davemloft.net> | 2019-09-15 08:17:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-09-15 08:17:27 -0400 |
commit | aa2eaa8c272a3211dec07ce9c6c863a7e355c10e (patch) | |
tree | 8454a23d36b2ff36133c276ee0ba80eabc00850e /net/core/dev.c | |
parent | a3d3c74da49c65fc63a937fa559186b0e16adca3 (diff) | |
parent | 1609d7604b847a9820e63393d1a3b6cac7286d40 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes in the btusb and ixgbe drivers.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index b1afafee3e2a..a9775d676285 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -8807,6 +8807,8 @@ int register_netdevice(struct net_device *dev) | |||
8807 | ret = notifier_to_errno(ret); | 8807 | ret = notifier_to_errno(ret); |
8808 | if (ret) { | 8808 | if (ret) { |
8809 | rollback_registered(dev); | 8809 | rollback_registered(dev); |
8810 | rcu_barrier(); | ||
8811 | |||
8810 | dev->reg_state = NETREG_UNREGISTERED; | 8812 | dev->reg_state = NETREG_UNREGISTERED; |
8811 | } | 8813 | } |
8812 | /* | 8814 | /* |