OSDN Git Service

Merge branch 'dsa-voidify-ops'
authorDavid S. Miller <davem@davemloft.net>
Fri, 8 Apr 2016 20:50:41 +0000 (16:50 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Apr 2016 20:51:15 +0000 (16:51 -0400)
commite013b7780c41b471c4269ac9ccafb65ba7c9ec86
treea416797b924cb52dfe9fe95464f12205286e7bc7
parentf453939c1a4a758312f799748b344bacd1db701f
parent4d5770b39710180644f655b2c6cb0c880d108c63
Merge branch 'dsa-voidify-ops'

Vivien Didelot says:

====================
net: dsa: voidify STP setter and FDB/VLAN add ops

Neither the DSA layer nor the bridge code (see br_set_state) really care
about eventual errors from STP state setters, so make it void.

The DSA layer separates the prepare and commit phases of switchdev in
two different functions. Logical errors must not happen in commit
routines, so make them void.

Changes v1 -> v2:
  - rename port_stp_update to port_stp_state_set
  - don't change code flow of bcm_sf2_sw_br_set_stp_state
  - prefer netdev_err over netdev_warn
====================

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>