diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 14:08:06 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 14:08:06 -0400 |
| commit | 86be8883a73a3ecd98a76f05d6374af8836bac63 (patch) | |
| tree | d172012cd514432015d54d55a88d65311d27d209 | |
| parent | 437a511d6742613ca1851f36aed2b51e1851a6d7 (diff) | |
| download | longterm-queue-4.12-86be8883a73a3ecd98a76f05d6374af8836bac63.tar.gz | |
bridge: refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/net-bridge-fix-early-call-to-br_stp_change_bridge_id.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/queue/net-bridge-fix-early-call-to-br_stp_change_bridge_id.patch b/queue/net-bridge-fix-early-call-to-br_stp_change_bridge_id.patch index 60f7f2c..46ea821 100644 --- a/queue/net-bridge-fix-early-call-to-br_stp_change_bridge_id.patch +++ b/queue/net-bridge-fix-early-call-to-br_stp_change_bridge_id.patch @@ -1,4 +1,4 @@ -From 84aeb437ab98a2bce3d4b2111c79723aedfceb33 Mon Sep 17 00:00:00 2001 +From c07b67c2abc4565ba2f8f3cd44c9ad623d673651 Mon Sep 17 00:00:00 2001 From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Date: Mon, 18 Dec 2017 17:35:09 +0200 Subject: [PATCH] net: bridge: fix early call to br_stp_change_bridge_id and @@ -57,12 +57,13 @@ Fixes: 30313a3d5794 ("bridge: Handle IFLA_ADDRESS correctly when creating bridge Fixes: 5b8d5429daa0 ("bridge: netlink: register netdevice before executing changelink") Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c -index d0ef0a8e8831..015f465c514b 100644 +index 73481a925982..45eefac59b1b 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c -@@ -1262,19 +1262,20 @@ static int br_dev_newlink(struct net *src_net, struct net_device *dev, +@@ -1173,19 +1173,20 @@ static int br_dev_newlink(struct net *src_net, struct net_device *dev, struct net_bridge *br = netdev_priv(dev); int err; @@ -80,7 +81,7 @@ index d0ef0a8e8831..015f465c514b 100644 - if (err) - return err; - - err = br_changelink(dev, tb, data, extack); + err = br_changelink(dev, tb, data); if (err) - unregister_netdevice(dev); + br_dev_delete(dev, NULL); |