diff options
| author | David S. Miller <davem@davemloft.net> | 2013-11-08 00:22:54 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-08 00:22:54 (GMT) |
| commit | e21dd863acec8d3bc5166fb2a0c680a9982b37db (patch) | |
| tree | 8d328edce3828c60e80989267eb7594d2d7e24d6 /include/linux | |
| parent | 3cdcf1334cd76bbcabd0f273ee9a13e4cc7816bc (diff) | |
| parent | 163561a4e2f8af44e96453bc10c7a4f9bcc736e1 (diff) | |
| download | linux-fsl-qoriq-e21dd863acec8d3bc5166fb2a0c680a9982b37db.tar.xz | |
Merge branch 'mlx4'
Amir Vadai says:
====================
net/mlx4: Mellanox driver update 07-11-2013
This patchset contains some enhancements and bug fixes for the mlx4_* drivers.
Patchset was applied and tested against commit: "9bb8ca8 virtio-net: switch to
use XPS to choose txq"
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mlx4/device.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index f6f5927..7d3a523 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -662,6 +662,7 @@ struct mlx4_dev { u8 rev_id; char board_id[MLX4_BOARD_ID_LEN]; int num_vfs; + int numa_node; int oper_log_mgm_entry_size; u64 regid_promisc_array[MLX4_MAX_PORTS + 1]; u64 regid_allmulti_array[MLX4_MAX_PORTS + 1]; @@ -834,7 +835,7 @@ void mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn); int mlx4_uar_alloc(struct mlx4_dev *dev, struct mlx4_uar *uar); void mlx4_uar_free(struct mlx4_dev *dev, struct mlx4_uar *uar); -int mlx4_bf_alloc(struct mlx4_dev *dev, struct mlx4_bf *bf); +int mlx4_bf_alloc(struct mlx4_dev *dev, struct mlx4_bf *bf, int node); void mlx4_bf_free(struct mlx4_dev *dev, struct mlx4_bf *bf); int mlx4_mtt_init(struct mlx4_dev *dev, int npages, int page_shift, |