|
@@ -565,34 +565,38 @@ static void mlx4_en_put_qp(struct mlx4_en_priv *priv)
|
|
|
struct mlx4_en_dev *mdev = priv->mdev;
|
|
|
struct mlx4_dev *dev = mdev->dev;
|
|
|
int qpn = priv->base_qpn;
|
|
|
- u64 mac = mlx4_en_mac_to_u64(priv->dev->dev_addr);
|
|
|
-
|
|
|
- en_dbg(DRV, priv, "Registering MAC: %pM for deleting\n",
|
|
|
- priv->dev->dev_addr);
|
|
|
- mlx4_unregister_mac(dev, priv->port, mac);
|
|
|
+ u64 mac;
|
|
|
|
|
|
- if (dev->caps.steering_mode != MLX4_STEERING_MODE_A0) {
|
|
|
+ if (dev->caps.steering_mode == MLX4_STEERING_MODE_A0) {
|
|
|
+ mac = mlx4_en_mac_to_u64(priv->dev->dev_addr);
|
|
|
+ en_dbg(DRV, priv, "Registering MAC: %pM for deleting\n",
|
|
|
+ priv->dev->dev_addr);
|
|
|
+ mlx4_unregister_mac(dev, priv->port, mac);
|
|
|
+ } else {
|
|
|
struct mlx4_mac_entry *entry;
|
|
|
struct hlist_node *tmp;
|
|
|
struct hlist_head *bucket;
|
|
|
- unsigned int mac_hash;
|
|
|
+ unsigned int i;
|
|
|
|
|
|
- mac_hash = priv->dev->dev_addr[MLX4_EN_MAC_HASH_IDX];
|
|
|
- bucket = &priv->mac_hash[mac_hash];
|
|
|
- hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {
|
|
|
- if (ether_addr_equal_64bits(entry->mac,
|
|
|
- priv->dev->dev_addr)) {
|
|
|
- en_dbg(DRV, priv, "Releasing qp: port %d, MAC %pM, qpn %d\n",
|
|
|
- priv->port, priv->dev->dev_addr, qpn);
|
|
|
+ for (i = 0; i < MLX4_EN_MAC_HASH_SIZE; ++i) {
|
|
|
+ bucket = &priv->mac_hash[i];
|
|
|
+ hlist_for_each_entry_safe(entry, tmp, bucket, hlist) {
|
|
|
+ mac = mlx4_en_mac_to_u64(entry->mac);
|
|
|
+ en_dbg(DRV, priv, "Registering MAC: %pM for deleting\n",
|
|
|
+ entry->mac);
|
|
|
mlx4_en_uc_steer_release(priv, entry->mac,
|
|
|
qpn, entry->reg_id);
|
|
|
- mlx4_qp_release_range(dev, qpn, 1);
|
|
|
|
|
|
+ mlx4_unregister_mac(dev, priv->port, mac);
|
|
|
hlist_del_rcu(&entry->hlist);
|
|
|
kfree_rcu(entry, rcu);
|
|
|
- break;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ en_dbg(DRV, priv, "Releasing qp: port %d, qpn %d\n",
|
|
|
+ priv->port, qpn);
|
|
|
+ mlx4_qp_release_range(dev, qpn, 1);
|
|
|
+ priv->flags &= ~MLX4_EN_FLAG_FORCE_PROMISC;
|
|
|
}
|
|
|
}
|
|
|
|