rocker: mark STP update as 'no wait' processing
authorScott Feldman <sfeldma@gmail.com>
Sat, 13 Jun 2015 04:35:48 +0000 (21:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 15 Jun 2015 23:06:49 +0000 (16:06 -0700)
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>
drivers/net/ethernet/rocker/rocker.c

index 1995b592af4ee062614a21d4cef3393ad409dd04..6c15c2e184fce6ba4d1ed3760b51870bcebbdbda 100644 (file)
@@ -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: