From: Kumar Sanghvi Date: Tue, 18 Feb 2014 10:47:57 +0000 (+0530) Subject: linux-next-cherry-picks: Bring upstream fix on RDMA/cxgb4 LE-Workaround path X-Git-Tag: vofed-3.12~26 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d6906363b28b05a2c5b7cfaf930cf4297b102ab2;p=~emulex%2Fcompat-rdma.git linux-next-cherry-picks: Bring upstream fix on RDMA/cxgb4 LE-Workaround path 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 --- 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 index 0000000..ff16b90 --- /dev/null +++ b/linux-next-cherry-picks/0043-RDMA-cxgb4-Add-missing-neigh_release-in-LE-Workaroun.patch @@ -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);