Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / mlx4 / fw.h

diff --git a/drivers/net/mlx4/fw.h b/drivers/net/mlx4/fw.h
index 88003eb..1e8ecc3 100644 (file)
--- a/drivers/net/mlx4/fw.h
+++ b/drivers/net/mlx4/fw.h
@@ -78,12 +78,7 @@ struct mlx4_dev_cap {
        u16 wavelength[MLX4_MAX_PORTS + 1];
        u64 trans_code[MLX4_MAX_PORTS + 1];
        u16 stat_rate_support;
-       int udp_rss;
-       int loopback_support;
-       int vep_uc_steering;
-       int vep_mc_steering;
-       int wol;
-       u32 flags;
+       u64 flags;
        int reserved_uars;
        int uar_size;
        int min_page_sz;
@@ -116,6 +111,7 @@ struct mlx4_dev_cap {
        u8  supported_port_types[MLX4_MAX_PORTS + 1];
        u8  log_max_macs[MLX4_MAX_PORTS + 1];
        u8  log_max_vlans[MLX4_MAX_PORTS + 1];
+       u32 max_counters;
 };
 
 struct mlx4_adapter {