Pull InfiniBand/RDMA updates from Roland Dreier: - IPoIB fixes from Doug Ledford and Erez Shitrit - iSER updates from Sagi Grimberg - mlx4 GUID handling changes from Yishai Hadas - other misc fixes * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (51 commits) mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit architectures IB/iser: Rewrite bounce buffer code path IB/iser: Bump version to 1.6 IB/iser: Remove code duplication for a single DMA entry IB/iser: Pass struct iser_mem_reg to iser_fast_reg_mr and iser_reg_sig_mr IB/iser: Modify struct iser_mem_reg members IB/iser: Make fastreg pool cache friendly IB/iser: Move PI context alloc/free to routines IB/iser: Move fastreg descriptor pool get/put to helper functions IB/iser: Merge build page-vec into register page-vec IB/iser: Get rid of struct iser_rdma_regd IB/iser: Remove redundant assignments in iser_reg_page_vec IB/iser: Move memory reg/dereg routines to iser_memory.c IB/iser: Don't pass ib_device to fall_to_bounce_buff routine IB/iser: Remove a redundant struct iser_data_buf IB/iser: Remove redundant cmd_data_len calculation IB/iser: Fix wrong calculation of protection buffer length IB/iser: Handle fastreg/local_inv completion errors IB/iser: Fix unload during ep_poll wrong dereference ib_srpt: convert printk's to pr_* functions ...
Showing the changes to include/linux (1 of 28 files). Show all
Unified · Split
| @@ -1345,6 +1345,10 @@ int mlx4_wol_write(struct mlx4_dev *dev, u64 config, int port); · 1344 unmodified lines | |||
| 1345 | int mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx); | 1345 | int mlx4_counter_alloc(struct mlx4_dev *dev, u32 *idx); |
| 1346 | void mlx4_counter_free(struct mlx4_dev *dev, u32 idx); | 1346 | void mlx4_counter_free(struct mlx4_dev *dev, u32 idx); |
| 1347 | 1347 | ||
| 1348 | void mlx4_set_admin_guid(struct mlx4_dev *dev, __be64 guid, int entry, | ||
| 1349 | int port); | ||
| 1350 | __be64 mlx4_get_admin_guid(struct mlx4_dev *dev, int entry, int port); | ||
| 1351 | void mlx4_set_random_admin_guid(struct mlx4_dev *dev, int entry, int port); | ||
| 1348 | int mlx4_flow_attach(struct mlx4_dev *dev, | 1352 | int mlx4_flow_attach(struct mlx4_dev *dev, |
| 1349 | struct mlx4_net_trans_rule *rule, u64 *reg_id); | 1353 | struct mlx4_net_trans_rule *rule, u64 *reg_id); |
| 1350 | int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id); | 1354 | int mlx4_flow_detach(struct mlx4_dev *dev, u64 reg_id); |