From: Mitesh Ahuja <mitesh.ahuja@emulex.com>
Date: Thu, 12 Feb 2015 09:42:14 +0000 (-0800)
Subject: RDMA/ocrdma : Backport support for RHEL 6.[56]
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ded75cfced0b313b67b901d4ea2b91c81e3b952d;p=~emulex%2Ffor-vlad%2Fold%2Fcompat-rdma.git

RDMA/ocrdma : Backport support for RHEL 6.[56]
---

diff --git a/linux-next-pending/0009-RDMA-ocrdma-Backport-support-for-RHEL-6.-56.patch b/linux-next-pending/0009-RDMA-ocrdma-Backport-support-for-RHEL-6.-56.patch
new file mode 100644
index 0000000..53f89f4
--- /dev/null
+++ b/linux-next-pending/0009-RDMA-ocrdma-Backport-support-for-RHEL-6.-56.patch
@@ -0,0 +1,41 @@
+From 37ac36d8b6fceb21da5ecaebdae34e19db41ceb5 Mon Sep 17 00:00:00 2001
+From: Mitesh Ahuja <mitesh.ahuja@emulex.com>
+Date: Wed, 11 Feb 2015 04:00:22 -0800
+Subject: [PATCH] RDMA/ocrdma : Backport support for RHEL 6.[56]
+
+Fixing compilation issues for RHEL 6.5 and RHEL 6.6
+---
+ drivers/infiniband/hw/ocrdma/ocrdma_main.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+index 7a2b59a..6fe4236 100644
+--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
++++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+@@ -426,7 +426,11 @@ static void ocrdma_init_ipv6_gids(struct ocrdma_dev *dev,
+ 	in6_dev = in6_dev_get(net);
+ 	if (in6_dev) {
+ 		read_lock_bh(&in6_dev->lock);
++#ifndef HAVE_INETADDR_IF_NEXT
+ 		list_for_each_entry(ifp, &in6_dev->addr_list, if_list) {
++#else
++		for(ifp=in6_dev->addr_list; ifp; ifp=ifp->if_next) {
++#endif
+ 			pgid = (union ib_gid *)&ifp->addr;
+ 			ocrdma_add_sgid(dev, pgid);
+ 		}
+@@ -467,7 +471,11 @@ static struct ocrdma_dev *ocrdma_add(struct be_dev_info *dev_info)
+ 		goto idr_err;
+ 
+ 	memcpy(&dev->nic_info, dev_info, sizeof(*dev_info));
++#ifdef HAVE_IDR_NEW_INTERFACE
+ 	dev->id = idr_alloc(&ocrdma_dev_id, NULL, 0, 0, GFP_KERNEL);
++#else
++	idr_get_new(&ocrdma_dev_id, NULL,&dev->id );
++#endif
+ 	if (dev->id < 0)
+ 		goto idr_err;
+ 
+-- 
+1.7.1
+