* [PATCH net] net: bridge: check __vlan_vid_del for error
@ 2015-09-06 1:27 Vivien Didelot
2015-09-06 6:32 ` Jiri Pirko
2015-09-09 5:32 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Vivien Didelot @ 2015-09-06 1:27 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, kernel, David S. Miller, Scott Feldman, Jiri Pirko,
Vivien Didelot
Since __vlan_del can return an error code, change its inner function
__vlan_vid_del to return an eventual error from switchdev_port_obj_del.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
net/bridge/br_vlan.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 3cd8cc9..5f5a02b 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -117,10 +117,11 @@ out_filt:
return err;
}
-static void __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
- u16 vid)
+static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
+ u16 vid)
{
const struct net_device_ops *ops = dev->netdev_ops;
+ int err = 0;
/* If driver uses VLAN ndo ops, use 8021q to delete vid
* on device, otherwise try switchdev ops to delete vid.
@@ -137,8 +138,12 @@ static void __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
},
};
- switchdev_port_obj_del(dev, &vlan_obj);
+ err = switchdev_port_obj_del(dev, &vlan_obj);
+ if (err == -EOPNOTSUPP)
+ err = 0;
}
+
+ return err;
}
static int __vlan_del(struct net_port_vlans *v, u16 vid)
@@ -151,7 +156,11 @@ static int __vlan_del(struct net_port_vlans *v, u16 vid)
if (v->port_idx) {
struct net_bridge_port *p = v->parent.port;
- __vlan_vid_del(p->dev, p->br, vid);
+ int err;
+
+ err = __vlan_vid_del(p->dev, p->br, vid);
+ if (err)
+ return err;
}
clear_bit(vid, v->vlan_bitmap);
--
2.5.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] net: bridge: check __vlan_vid_del for error
2015-09-06 1:27 [PATCH net] net: bridge: check __vlan_vid_del for error Vivien Didelot
@ 2015-09-06 6:32 ` Jiri Pirko
2015-09-09 5:32 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Pirko @ 2015-09-06 6:32 UTC (permalink / raw)
To: Vivien Didelot
Cc: netdev, linux-kernel, kernel, David S. Miller, Scott Feldman
Sun, Sep 06, 2015 at 03:27:57AM CEST, vivien.didelot@savoirfairelinux.com wrote:
>Since __vlan_del can return an error code, change its inner function
>__vlan_vid_del to return an eventual error from switchdev_port_obj_del.
>
>Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] net: bridge: check __vlan_vid_del for error
2015-09-06 1:27 [PATCH net] net: bridge: check __vlan_vid_del for error Vivien Didelot
2015-09-06 6:32 ` Jiri Pirko
@ 2015-09-09 5:32 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2015-09-09 5:32 UTC (permalink / raw)
To: vivien.didelot; +Cc: netdev, linux-kernel, kernel, sfeldma, jiri
From: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Date: Sat, 5 Sep 2015 21:27:57 -0400
> Since __vlan_del can return an error code, change its inner function
> __vlan_vid_del to return an eventual error from switchdev_port_obj_del.
>
> Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-09-09 5:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-06 1:27 [PATCH net] net: bridge: check __vlan_vid_del for error Vivien Didelot
2015-09-06 6:32 ` Jiri Pirko
2015-09-09 5:32 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).