diff options
| author |   Jason Gunthorpe <jgg@mellanox.com> | 2018-05-28 11:44:35 -0600 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2018-05-28 11:44:35 -0600 |
| commit | 0394808d9ed5ca9d3595ca4d97ce79faf845ac77 (patch) | |
| tree | fd183abcc31abe5baeaaabf0b00e2671e4b11ad9 /drivers/infiniband/hw/i40iw/i40iw_cm.c | |
| parent | IB/rxe: avoid unnecessary export (diff) | |
| parent | IB/mlx4: Mark user MR as writable if actual virtual memory is writable (diff) | |
| download | linux-dev-0394808d9ed5ca9d3595ca4d97ce79faf845ac77.tar.xz linux-dev-0394808d9ed5ca9d3595ca4d97ce79faf845ac77.zip | |
Merge branch 'mr_fix' into git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma for-next
Update mlx4 to support user MR creation against read-only memory, previously
it required the memory to be writable.
Based on rdma for-rc due to dependencies.
* mr_fix: (2 commits)
IB/mlx4: Mark user MR as writable if actual virtual memory is writable
IB/core: Make testing MR flags for writability a static inline function
Diffstat (limited to 'drivers/infiniband/hw/i40iw/i40iw_cm.c')
| -rw-r--r-- | drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c b/drivers/infiniband/hw/i40iw/i40iw_cm.c index a24daac719c3..7b2655128b9f 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_cm.c +++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c @@ -2085,7 +2085,7 @@ static int i40iw_addr_resolve_neigh_ipv6(struct i40iw_device *iwdev, if (netif_is_bond_slave(netdev)) netdev = netdev_master_upper_dev_get(netdev); - neigh = dst_neigh_lookup(dst, &dst_addr); + neigh = dst_neigh_lookup(dst, dst_addr.sin6_addr.in6_u.u6_addr32); rcu_read_lock(); if (neigh) { |