diff options
author | Scott Feldman <sfeldma@gmail.com> | 2015-06-12 21:35:48 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-06-15 16:06:49 -0700 |
commit | ac28393e8514927e58af99ea12d4ee0eac6d11a8 (patch) | |
tree | 3e940b86d169b53d5109f98f9847be34a9cf5537 /drivers/net/ethernet/rocker | |
parent | 02a9fbfc878ec3e4c17b11d6ac41dfe86667b732 (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 <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/rocker')
-rw-r--r-- | drivers/net/ethernet/rocker/rocker.c | 3 |
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: |