diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-02 18:29:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-02 18:29:28 -0700 |
| commit | 98846e698d99533321f39fe5b7df06c1b02a5e66 (patch) | |
| tree | d53a5f5494a945eca03c7ec10739b975b0f6fff7 /drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | |
| parent | 1b037474d0c0b5ceb65bc809e3d8ac4497ee041b (diff) | |
| parent | bb273617a65b9ed75f8cf9417206cbfcfb41fc48 (diff) | |
| download | blackbird-op-linux-98846e698d99533321f39fe5b7df06c1b02a5e66.tar.gz blackbird-op-linux-98846e698d99533321f39fe5b7df06c1b02a5e66.zip | |
Merge branch 'mlx4'
Amir Vadai says:
====================
Mellanox EN driver fixes 2014-06-23
Below are some fixes to patches submitted to 3.16.
First patch is according to discussions with Ben [1] and Thomas [2] - to do not
use affinity notifier, since it breaks RFS. Instead detect changes in IRQ
affinity map, by checking if current CPU is set in affinity map on NAPI poll.
The two other patches fix some bugs introduced in commit [3].
Patches were applied and tested over commit dba6311: ('powerpc: bpf: Fix the
broken LD_VLAN_TAG_PRESENT test')
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mlx4_en.h')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h index 0e15295bedd6..624e1939e9ee 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h @@ -343,6 +343,7 @@ struct mlx4_en_cq { #define CQ_USER_PEND (MLX4_EN_CQ_STATE_POLL | MLX4_EN_CQ_STATE_POLL_YIELD) spinlock_t poll_lock; /* protects from LLS/napi conflicts */ #endif /* CONFIG_NET_RX_BUSY_POLL */ + struct irq_desc *irq_desc; }; struct mlx4_en_port_profile { |
