aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Feldman <[email protected]>2015-06-12 21:35:48 -0700
committerDavid S. Miller <[email protected]>2015-06-15 16:06:49 -0700
commitac28393e8514927e58af99ea12d4ee0eac6d11a8 (patch)
tree3e940b86d169b53d5109f98f9847be34a9cf5537
parent02a9fbfc878ec3e4c17b11d6ac41dfe86667b732 (diff)
rocker: mark STP update as 'no wait' processing
We can get STP updates from the bridge driver in atomic and non-atomic contexts. Since we can't test what context we're getting called in, do the STP processing as 'no wait', which will cover all cases. Signed-off-by: Scott Feldman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
-rw-r--r--drivers/net/ethernet/rocker/rocker.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 1995b592af4e..6c15c2e184fc 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4286,7 +4286,8 @@ static int rocker_port_attr_set(struct net_device *dev,
switch (attr->id) {
case SWITCHDEV_ATTR_PORT_STP_STATE:
- err = rocker_port_stp_update(rocker_port, attr->trans, 0,
+ err = rocker_port_stp_update(rocker_port, attr->trans,
+ ROCKER_OP_FLAG_NOWAIT,
attr->u.stp_state);
break;
case SWITCHDEV_ATTR_PORT_BRIDGE_FLAGS: