Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

[cascardo/linux.git] / drivers / net / ethernet / mellanox / mlx4 / mlx4.h

diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index c92269f..5da51b9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -697,13 +697,12 @@ struct mlx4_sense {
 
 struct mlx4_msix_ctl {
        u64             pool_bm;
-       spinlock_t      pool_lock;
+       struct mutex    pool_lock;
 };
 
 struct mlx4_steer {
        struct list_head promisc_qps[MLX4_NUM_STEERS];
        struct list_head steer_entries[MLX4_NUM_STEERS];
-       struct list_head high_prios;
 };
 
 struct mlx4_priv {