diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-15 13:06:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-15 13:06:56 -0700 |
| commit | d5dfe4f1b44ed532653c2335267ad9599c8a698e (patch) | |
| tree | cf01adc3e0d24744684093354a8f6fa8baae5311 /drivers/infiniband/hw/i40iw/i40iw_hw.c | |
| parent | ce24729667cf8aaebf290613a6026a50a22c3eee (diff) | |
| parent | ccfdbaa5cf4601b9b71601893029dcc9245c002b (diff) | |
| download | linux-stable-d5dfe4f1b44ed532653c2335267ad9599c8a698e.tar.gz linux-stable-d5dfe4f1b44ed532653c2335267ad9599c8a698e.tar.bz2 linux-stable-d5dfe4f1b44ed532653c2335267ad9599c8a698e.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fixes from Jason Gunthorpe:
"A few minor bug fixes for user visible defects, and one regression:
- Various bugs from static checkers and syzkaller
- Add missing error checking in mlx4
- Prevent RTNL lock recursion in i40iw
- Fix segfault in cxgb4 in peer abort cases
- Fix a regression added in 5.7 where the IB_EVENT_DEVICE_FATAL could
be lost, and wasn't delivered to all the FDs"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
RDMA/uverbs: Move IB_EVENT_DEVICE_FATAL to destroy_uobj
RDMA/uverbs: Do not discard the IB_EVENT_DEVICE_FATAL event
RDMA/iw_cxgb4: Fix incorrect function parameters
RDMA/core: Fix double put of resource
IB/core: Fix potential NULL pointer dereference in pkey cache
IB/hfi1: Fix another case where pq is left on waitlist
IB/i40iw: Remove bogus call to netdev_master_upper_dev_get()
IB/mlx4: Test return value of calls to ib_get_cached_pkey
RDMA/rxe: Always return ERR_PTR from rxe_create_mmap_info()
i40iw: Fix error handling in i40iw_manage_arp_cache()
Diffstat (limited to 'drivers/infiniband/hw/i40iw/i40iw_hw.c')
| -rw-r--r-- | drivers/infiniband/hw/i40iw/i40iw_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/i40iw/i40iw_hw.c b/drivers/infiniband/hw/i40iw/i40iw_hw.c index 55a1fbf0e670..ae8b97c30665 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_hw.c +++ b/drivers/infiniband/hw/i40iw/i40iw_hw.c @@ -534,7 +534,7 @@ void i40iw_manage_arp_cache(struct i40iw_device *iwdev, int arp_index; arp_index = i40iw_arp_table(iwdev, ip_addr, ipv4, mac_addr, action); - if (arp_index == -1) + if (arp_index < 0) return; cqp_request = i40iw_get_cqp_request(&iwdev->cqp, false); if (!cqp_request) |