]> git.openfabrics.org - ~emulex/for-vlad/compat-rdma.git/commitdiff
linux-next-cherry-picks: Bring upstream fix on RDMA/cxgb4 LE-Workaround path
authorKumar Sanghvi <kumaras@chelsio.com>
Tue, 18 Feb 2014 10:47:57 +0000 (16:17 +0530)
committerVipul Pandya <vipul@chelsio.com>
Tue, 18 Feb 2014 11:09:41 +0000 (03:09 -0800)
This brings upstream fix 0f01320 (RDMA/cxgb4: Add missing neigh_release in LE-Workaround path),
and makes corresponding backport adjustment.
This resolves OFED Bugzilla Bug#2459

Signed-off-by: Kumar Sanghvi <kumaras@chelsio.com>
linux-next-cherry-picks/0043-RDMA-cxgb4-Add-missing-neigh_release-in-LE-Workaroun.patch [new file with mode: 0644]

diff --git a/linux-next-cherry-picks/0043-RDMA-cxgb4-Add-missing-neigh_release-in-LE-Workaroun.patch b/linux-next-cherry-picks/0043-RDMA-cxgb4-Add-missing-neigh_release-in-LE-Workaroun.patch
new file mode 100644 (file)
index 0000000..ff16b90
--- /dev/null
@@ -0,0 +1,14 @@
+diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
+index 5a1bf82..c72367d 100644
+--- a/drivers/infiniband/hw/cxgb4/cm.c
++++ b/drivers/infiniband/hw/cxgb4/cm.c
+@@ -3431,6 +3431,9 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb)
+               goto free_dst;
+       }
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
++      neigh_release(neigh);
++#endif
+       step = dev->rdev.lldi.nrxq / dev->rdev.lldi.nchan;
+       rss_qid = dev->rdev.lldi.rxq_ids[pi->port_id * step];
+       window = (__force u16) htons((__force u16)tcph->window);