Hi Linus,
This should be the last pull request for the 4.4 cycle. There are three
fixes here. The first two were very small in terms of number of lines,
the third is more lines of change than I like this late in the cycle,
but there are positive test results from Avagotech and from my own test
setup with the target hardware, and given the problem was a 100% failure
case, I sent it through.
The following changes since commit ab5cdc31630c7596d81ca8fbe7d695f10666f39b:
IB/mlx5: Postpone remove_keys under knowledge of coming preemption
(2015-12-08 16:55:31 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
tags/for-linus
for you to fetch changes up to f41647ef06536199d3366530da050b411546979d:
RDMA/be2net: Remove open and close entry points (2015-12-28 11:45:55
-0500)
----------------------------------------------------------------
Three late 4.4-rc fixes
- A previous patch updated the mlx4 driver to use vmalloc when there was
not enough memory to get a contiguous region large enough for our needs,
so we need kvfree() whenever we free that item. We missed one place,
so fix that now.
- A previous patch added code to match incoming packets against a specific
device, but failed to compensate for devices that have both InfiniBand
and Ethernet ports. Fix that.
- Under certain vlan conditions, the ocrdma driver would fail to bring up
any vlan interfaces and would print out a circular locking failure. Fix
that.
----------------------------------------------------------------
Devesh Sharma (4):
RDMA/ocrdma: Fix vlan-id assignment in qp parameters
RDMA/ocrdma: Dispatch only port event when port state changes
RDMA/ocrdma: Depend on async link events from CNA
RDMA/be2net: Remove open and close entry points
Matan Barak (1):
IB/cma: cma_match_net_dev needs to take into account port_num
Wengang Wang (1):
IB/mlx4: Replace kfree with kvfree in mlx4_ib_destroy_srq
drivers/infiniband/core/cma.c | 16 ++++----
drivers/infiniband/hw/mlx4/srq.c | 2 +-
drivers/infiniband/hw/ocrdma/ocrdma.h | 10 +++++
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 49 ++++++++++++++++++++-----
drivers/infiniband/hw/ocrdma/ocrdma_hw.h | 4 +-
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 57
+++++++++++++----------------
drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 49 +++++++++++++++++++++++--
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +-
drivers/net/ethernet/emulex/benet/be.h | 2 -
drivers/net/ethernet/emulex/benet/be_main.c | 4 --
drivers/net/ethernet/emulex/benet/be_roce.c | 36 ------------------
drivers/net/ethernet/emulex/benet/be_roce.h | 4 +-
12 files changed, 134 insertions(+), 101 deletions(-)
--
Doug Ledford <dledford@xxxxxxxxxx>
GPG KeyID: 0E572FDD
Attachment:
signature.asc
Description: OpenPGP digital signature
