From patchwork Wed Sep 22 20:30:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 65453 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EF253B70DA for ; Thu, 23 Sep 2010 06:37:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755101Ab0IVUhB (ORCPT ); Wed, 22 Sep 2010 16:37:01 -0400 Received: from smtp103.sbc.mail.gq1.yahoo.com ([67.195.15.62]:29719 "HELO smtp103.sbc.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752159Ab0IVUhA (ORCPT ); Wed, 22 Sep 2010 16:37:00 -0400 Received: (qmail 11483 invoked from network); 22 Sep 2010 20:30:19 -0000 Received: from localhost.localdomain (nab@70.132.7.7 with login) by smtp103.sbc.mail.gq1.yahoo.com with SMTP; 22 Sep 2010 13:30:19 -0700 PDT X-Yahoo-SMTP: fzDSGlOswBCWnIOrNw7KwwK1j9PqyNbe5PtLKiS4dDU.UNl_t6bdEZu9tTLW X-YMail-OSG: u_.osB8VM1meurLOlzK0VIDt5suOE_wkFnTPBWIdkNivjE5 zFk5YnAYidXiN32oQDq1XF8Sm5NfWUlaliR_Bx3qvjWtfPNB3HK9m3ScUqKE jGnLE2VgY20x1nfKDo67BJr4cO_ueYBUmKFdbDU0EtIxr3A.Vkw0oyKlCIAy y5jJTEQbHUZ4uvwwNUqF.cSd.m73UFY79uJ3iaYtf64T05Puht8sdZLWlig1 _TDeiOKjvL0i7dsv4rtjdi0lVwis0ZG1IdFzPiwFKsW2hp15g2j3Z49_.wmF _3nz0G3KD0YzqP6nEJ6TmzMZVXzcJwLuvG5rVMsLL6nzVr1qqZmRDIUjE X-Yahoo-Newman-Property: ymail-3 From: "Nicholas A. Bellinger" To: linux-kernel , netdev , linux-rdma , Bernard Metzler Cc: David Miller , Matthew Wilcox , Andi Keen , Roland Dreier , Nicholas Bellinger Subject: [PATCH 1/2] siw: Fix ib_register_device() for > v2.6.34 kernels Date: Wed, 22 Sep 2010 13:30:17 -0700 Message-Id: <1285187417-10928-1-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.5.6.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nicholas Bellinger 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. Signed-off-by: Nicholas A. Bellinger --- softiwarp/siw_main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/softiwarp/siw_main.c b/softiwarp/siw_main.c index cacedea..c97adee 100644 --- a/softiwarp/siw_main.c +++ b/softiwarp/siw_main.c @@ -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);