Skip to contentSkip to conversation

siw: Fix ib_register_device() for > v2.6.34 kernels

PATCH In review Nicholas A. Bellinger 2 participants 2 messages Sep 22, 2010 – Sep 23, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 siw: Fix ib_register_device() for > v2.6.34 kernels

From: Nicholas Bellinger <[email protected]>

This patch adds a LINUX_VERSION_CODE > v2.6.34 check inside of siw_main.c:siw_register_device() around the use of ib_register_device(). In post v2.6.34 kernels this function accepts a second parameter used a sysfs port callback described here:

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=9a6edb60ec10d86b1025a0cdad68fd89f1ddaf02

This patch currently sets this second parameter to NULL.

---
 softiwarp/siw_main.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
softiwarp/siw_main.c +4 -1
index cacedea..c97adee 100644
@@ -233,8 +233,11 @@ int siw_register_device(struct siw_dev *dev)
 	ibdev->iwcm->add_ref = siw_qp_get_ref;
 	ibdev->iwcm->rem_ref = siw_qp_put_ref;
 	ibdev->iwcm->get_qp = siw_get_ofaqp;
-
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)
+	rv = ib_register_device(ibdev, NULL);
+#else
 	rv = ib_register_device(ibdev);
+#endif
 	if (rv) {
 		dprint(DBG_DM|DBG_ON, "(dev=%s): "
 			"ib_register_device failed: rv=%d\n", ibdev->name, rv);
Signature · 1 line
1.5.6.5
#1 lore raw

Thanks, Nicholas. Just applied your patch.

Bernard.

[email protected] wrote on 09/22/2010 10:30:17 PM:

Quoted 38 lines

From: Nicholas Bellinger <[email protected]>

This patch adds a LINUX_VERSION_CODE > v2.6.34 check inside of siw_main.c:siw_register_device()
around the use of ib_register_device(). In post v2.6.34 kernels this function accepts a second
parameter used a sysfs port callback described here:

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;
a=commitdiff;h=9a6edb60ec10d86b1025a0cdad68fd89f1ddaf02

This patch currently sets this second parameter to NULL.

---
 softiwarp/siw_main.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
softiwarp/siw_main.c +4 -2
index cacedea..c97adee 100644
@@ -233,8 +233,11 @@ int siw_register_device(struct siw_dev *dev)
    ibdev->iwcm->add_ref = siw_qp_get_ref;
    ibdev->iwcm->rem_ref = siw_qp_put_ref;
    ibdev->iwcm->get_qp = siw_get_ofaqp;
-
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)
+   rv = ib_register_device(ibdev, NULL);
+#else
    rv = ib_register_device(ibdev);
+#endif
    if (rv) {
       dprint(DBG_DM|DBG_ON, "(dev=%s): "
          "ib_register_device failed: rv=%d\n", ibdev->name, rv);
--

1.5.6.5

Quoted 4 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html