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 /include | |
| parent | 1b037474d0c0b5ceb65bc809e3d8ac4497ee041b (diff) | |
| parent | bb273617a65b9ed75f8cf9417206cbfcfb41fc48 (diff) | |
| download | linux-98846e698d99533321f39fe5b7df06c1b02a5e66.tar.bz2 | |
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 'include')
| -rw-r--r-- | include/linux/mlx4/device.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index b12f4bbd064c..35b51e7af886 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -578,8 +578,6 @@ struct mlx4_cq { u32 cons_index; u16 irq; - bool irq_affinity_change; - __be32 *set_ci_db; __be32 *arm_db; int arm_sn; @@ -1167,6 +1165,8 @@ int mlx4_assign_eq(struct mlx4_dev *dev, char *name, struct cpu_rmap *rmap, int *vector); void mlx4_release_eq(struct mlx4_dev *dev, int vec); +int mlx4_eq_get_irq(struct mlx4_dev *dev, int vec); + int mlx4_get_phys_port_id(struct mlx4_dev *dev); int mlx4_wol_read(struct mlx4_dev *dev, u64 *config, int port); int mlx4_wol_write(struct mlx4_dev *dev, u64 config, int port); |