[PATCH net-next v2 1/1] bridge: return error code when deleting Vlan

[Roman Mashak]

v2:
 Return err immediately if nbp_vlan_delete() fails (pointed by David Ahern)

Signed-off-by: Roman Mashak <m...@mojatatu.com>
---
 net/bridge/br_netlink.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index f0e8268..1efdd48 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -527,11 +527,13 @@ static int br_vlan_info(struct net_bridge *br, struct 
net_bridge_port *p,
 
        case RTM_DELLINK:
                if (p) {
-                       nbp_vlan_delete(p, vinfo->vid);
+                       err = nbp_vlan_delete(p, vinfo->vid);
+                       if (err)
+                               break;
                        if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER)
-                               br_vlan_delete(p->br, vinfo->vid);
+                               err = br_vlan_delete(p->br, vinfo->vid);
                } else {
-                       br_vlan_delete(br, vinfo->vid);
+                       err = br_vlan_delete(br, vinfo->vid);
                }
                break;
        }
-- 
1.9.1