diff options
author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2016-04-06 11:55:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-08 16:50:40 -0400 |
commit | 43c44a9f655170fb92536167b95b1c6ae8b732cb (patch) | |
tree | f6d94e8a1a8b61bdf651bd1848961d6b1921ed07 /include/net/dsa.h | |
parent | f453939c1a4a758312f799748b344bacd1db701f (diff) | |
download | talos-obmc-linux-43c44a9f655170fb92536167b95b1c6ae8b732cb.tar.gz talos-obmc-linux-43c44a9f655170fb92536167b95b1c6ae8b732cb.zip |
net: dsa: make the STP state function return void
The DSA layer doesn't care about the return code of the port_stp_update
routine, so make it void in the layer and the DSA drivers.
Replace the useless dsa_slave_stp_update function with a
dsa_slave_stp_state function used to reply to the switchdev
SWITCHDEV_ATTR_ID_PORT_STP_STATE attribute.
In the meantime, rename port_stp_update to port_stp_state_set to
explicit the state change.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/dsa.h')
-rw-r--r-- | include/net/dsa.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 6463bb2863ac..2123981fd94a 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -299,8 +299,8 @@ struct dsa_switch_driver { int (*port_bridge_join)(struct dsa_switch *ds, int port, struct net_device *bridge); void (*port_bridge_leave)(struct dsa_switch *ds, int port); - int (*port_stp_update)(struct dsa_switch *ds, int port, - u8 state); + void (*port_stp_state_set)(struct dsa_switch *ds, int port, + u8 state); /* * VLAN support |