]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
net/mlx4_en: Block insertion of ethtool steering rules while the interface is down
authorHadar Hen Zion <hadarh@mellanox.com>
Wed, 30 Jan 2013 23:07:07 +0000 (23:07 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 31 Jan 2013 17:48:47 +0000 (12:48 -0500)
Attaching steering rules while the interface is down is an invalid operation, block it.

Signed-off-by: Hadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c

index f36c219dffcfb4c49b28f1f7dbcc429c147214d8..6f8044daec4284836cb06951a81d7c2744e80add 100644 (file)
@@ -1006,7 +1006,8 @@ static int mlx4_en_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
        if ((cmd->cmd == ETHTOOL_GRXCLSRLCNT ||
             cmd->cmd == ETHTOOL_GRXCLSRULE ||
             cmd->cmd == ETHTOOL_GRXCLSRLALL) &&
-           mdev->dev->caps.steering_mode != MLX4_STEERING_MODE_DEVICE_MANAGED)
+           (mdev->dev->caps.steering_mode !=
+            MLX4_STEERING_MODE_DEVICE_MANAGED || !priv->port_up))
                return -EINVAL;
 
        switch (cmd->cmd) {
@@ -1042,7 +1043,8 @@ static int mlx4_en_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)
        struct mlx4_en_priv *priv = netdev_priv(dev);
        struct mlx4_en_dev *mdev = priv->mdev;
 
-       if (mdev->dev->caps.steering_mode != MLX4_STEERING_MODE_DEVICE_MANAGED)
+       if (mdev->dev->caps.steering_mode !=
+           MLX4_STEERING_MODE_DEVICE_MANAGED || !priv->port_up)
                return -EINVAL;
 
        switch (cmd->cmd) {