diff options
| author | David S. Miller <[email protected]> | 2016-12-28 14:36:54 -0500 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2016-12-28 14:36:54 -0500 |
| commit | 4b52416a3f15df80af46d97d41f32ef5dde6e5fb (patch) | |
| tree | 9697826bbafa4b6c068fbe188b47986180b77b99 /include/linux/mlx5/device.h | |
| parent | 0df0f207aab4f42e5c96a807adf9a6845b69e984 (diff) | |
| parent | 37f304d10030bb425c19099e7b955d9c3ec4cba3 (diff) | |
Merge branch 'mlx5-fixes'
Saeed Mahameed says:
====================
Mellanox 100G mlx5 fixes 28-12-2016
Some fixes for mlx5 core and ethernet driver.
for -stable:
net/mlx5: Check FW limitations on log_max_qp before setting it
net/mlx5: Cancel recovery work in remove flow
net/mlx5: Avoid shadowing numa_node
net/mlx5: Mask destination mac value in ethtool steering rules
net/mlx5: Prevent setting multicast macs for VFs
net/mlx5e: Don't sync netdev state when not registered
net/mlx5e: Disable netdev after close
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'include/linux/mlx5/device.h')
| -rw-r--r-- | include/linux/mlx5/device.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h index 9f489365b3d3..52b437431c6a 100644 --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h @@ -1071,11 +1071,6 @@ enum { MLX5_INFINIBAND_PORT_COUNTERS_GROUP = 0x20, }; -enum { - MLX5_PCIE_PERFORMANCE_COUNTERS_GROUP = 0x0, - MLX5_PCIE_TIMERS_AND_STATES_COUNTERS_GROUP = 0x2, -}; - static inline u16 mlx5_to_sw_pkey_sz(int pkey_sz) { if (pkey_sz > MLX5_MAX_LOG_PKEY_TABLE) |