diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2016-03-13 16:21:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-14 16:05:31 -0400 |
| commit | 16bfa7024eba5e36aff38ba62086b9027373007d (patch) | |
| tree | fd05f05fe264eada7ea446a554c0fa0933019abd /include | |
| parent | 71327a4e7d997276d49db92fd3d30008389ee6d5 (diff) | |
| download | linux-stable-16bfa7024eba5e36aff38ba62086b9027373007d.tar.gz linux-stable-16bfa7024eba5e36aff38ba62086b9027373007d.tar.bz2 linux-stable-16bfa7024eba5e36aff38ba62086b9027373007d.zip | |
net: dsa: make port_bridge_leave return void
netdev_upper_dev_unlink() which notifies NETDEV_CHANGEUPPER, returns
void, as well as del_nbp(). So there's no advantage to catch an eventual
error from the port_bridge_leave routine at the DSA level.
Make this routine void for the DSA layer and its existing drivers.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/dsa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 004e034184c1..6463bb2863ac 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -298,7 +298,7 @@ struct dsa_switch_driver { */ int (*port_bridge_join)(struct dsa_switch *ds, int port, struct net_device *bridge); - int (*port_bridge_leave)(struct dsa_switch *ds, int port); + void (*port_bridge_leave)(struct dsa_switch *ds, int port); int (*port_stp_update)(struct dsa_switch *ds, int port, u8 state); |