Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 956325bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull rdma fixes from Doug Ledford:

 - two minor bug fixes

 - relicense ocrdma driver to dual license, GPL or BSD

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  RDMA/ocrdma: update ocrdma module license string
  RDMA/ocrdma: update ocrdma license to dual-license
  IB/ipoib: Fix CONFIG_INFINIBAND_IPOIB_CM
  RDMA/cxgb3: fail get_dma_mr on 64 bit arches
parents d4ec1f18 b8f5595e

drivers/infiniband/hw/cxgb3/iwch_provider.c

+4 −0
Original line number Diff line number Diff line
@@ -736,6 +736,10 @@ static struct ib_mr *iwch_get_dma_mr(struct ib_pd *pd, int acc) 
	/*

	 * T3 only supports 32 bits of size.

	 */

	if (sizeof(phys_addr_t) > 4) {

		pr_warn_once(MOD "Cannot support dma_mrs on this platform.\n");

		return ERR_PTR(-ENOTSUPP);

	}

	bl.size = 0xffffffff;

	bl.addr = 0;

	kva = 0;

drivers/infiniband/hw/ocrdma/ocrdma.h

+34 −19
Original line number Diff line number Diff line 
/*******************************************************************

 * This file is part of the Emulex RoCE Device Driver for          *

 * RoCE (RDMA over Converged Ethernet) adapters.                   *

 * Copyright (C) 2008-2012 Emulex. All rights reserved.            *

 * EMULEX and SLI are trademarks of Emulex.                        *

 * www.emulex.com                                                  *

 *                                                                 *

 * This program is free software; you can redistribute it and/or   *

 * modify it under the terms of version 2 of the GNU General       *

 * Public License as published by the Free Software Foundation.    *

 * This program is distributed in the hope that it will be useful. *

 * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND          *

 * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,  *

 * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE      *

 * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD *

 * TO BE LEGALLY INVALID.  See the GNU General Public License for  *

 * more details, a copy of which can be found in the file COPYING  *

 * included with this package.                                     *

/* This file is part of the Emulex RoCE Device Driver for

 * RoCE (RDMA over Converged Ethernet) adapters.

 * Copyright (C) 2012-2015 Emulex. All rights reserved.

 * EMULEX and SLI are trademarks of Emulex.

 * www.emulex.com

 *

 * This software is available to you under a choice of one of two licenses.

 * You may choose to be licensed under the terms of the GNU General Public

 * License (GPL) Version 2, available from the file COPYING in the main

 * directory of this source tree, or the BSD license below:

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * - Redistributions of source code must retain the above copyright notice,

 *   this list of conditions and the following disclaimer.

 *

 * - Redistributions in binary form must reproduce the above copyright

 *   notice, this list of conditions and the following disclaimer in

 *   the documentation and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 * Contact Information:

 * linux-drivers@emulex.com
@@ -23,7 +38,7 @@ 
 * Emulex

 * 3333 Susan Street

 * Costa Mesa, CA 92626

 *******************************************************************/

 */



#ifndef __OCRDMA_H__

#define __OCRDMA_H__

drivers/infiniband/hw/ocrdma/ocrdma_abi.h

+34 −19
Original line number Diff line number Diff line 
/*******************************************************************

 * This file is part of the Emulex RoCE Device Driver for          *

 * RoCE (RDMA over Converged Ethernet) adapters.                   *

 * Copyright (C) 2008-2012 Emulex. All rights reserved.            *

 * EMULEX and SLI are trademarks of Emulex.                        *

 * www.emulex.com                                                  *

 *                                                                 *

 * This program is free software; you can redistribute it and/or   *

 * modify it under the terms of version 2 of the GNU General       *

 * Public License as published by the Free Software Foundation.    *

 * This program is distributed in the hope that it will be useful. *

 * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND          *

 * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,  *

 * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE      *

 * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD *

 * TO BE LEGALLY INVALID.  See the GNU General Public License for  *

 * more details, a copy of which can be found in the file COPYING  *

 * included with this package.                                     *

/* This file is part of the Emulex RoCE Device Driver for

 * RoCE (RDMA over Converged Ethernet) adapters.

 * Copyright (C) 2012-2015 Emulex. All rights reserved.

 * EMULEX and SLI are trademarks of Emulex.

 * www.emulex.com

 *

 * This software is available to you under a choice of one of two licenses.

 * You may choose to be licensed under the terms of the GNU General Public

 * License (GPL) Version 2, available from the file COPYING in the main

 * directory of this source tree, or the BSD license below:

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * - Redistributions of source code must retain the above copyright notice,

 *   this list of conditions and the following disclaimer.

 *

 * - Redistributions in binary form must reproduce the above copyright

 *   notice, this list of conditions and the following disclaimer in

 *   the documentation and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 * Contact Information:

 * linux-drivers@emulex.com
@@ -23,7 +38,7 @@ 
 * Emulex

 * 3333 Susan Street

 * Costa Mesa, CA 92626

 *******************************************************************/

 */



#ifndef __OCRDMA_ABI_H__

#define __OCRDMA_ABI_H__

drivers/infiniband/hw/ocrdma/ocrdma_ah.c

+34 −19
Original line number Diff line number Diff line 
/*******************************************************************

 * This file is part of the Emulex RoCE Device Driver for          *

 * RoCE (RDMA over Converged Ethernet) adapters.                   *

 * Copyright (C) 2008-2012 Emulex. All rights reserved.            *

 * EMULEX and SLI are trademarks of Emulex.                        *

 * www.emulex.com                                                  *

 *                                                                 *

 * This program is free software; you can redistribute it and/or   *

 * modify it under the terms of version 2 of the GNU General       *

 * Public License as published by the Free Software Foundation.    *

 * This program is distributed in the hope that it will be useful. *

 * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND          *

 * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,  *

 * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE      *

 * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD *

 * TO BE LEGALLY INVALID.  See the GNU General Public License for  *

 * more details, a copy of which can be found in the file COPYING  *

 * included with this package.                                     *

/* This file is part of the Emulex RoCE Device Driver for

 * RoCE (RDMA over Converged Ethernet) adapters.

 * Copyright (C) 2012-2015 Emulex. All rights reserved.

 * EMULEX and SLI are trademarks of Emulex.

 * www.emulex.com

 *

 * This software is available to you under a choice of one of two licenses.

 * You may choose to be licensed under the terms of the GNU General Public

 * License (GPL) Version 2, available from the file COPYING in the main

 * directory of this source tree, or the BSD license below:

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * - Redistributions of source code must retain the above copyright notice,

 *   this list of conditions and the following disclaimer.

 *

 * - Redistributions in binary form must reproduce the above copyright

 *   notice, this list of conditions and the following disclaimer in

 *   the documentation and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 * Contact Information:

 * linux-drivers@emulex.com
@@ -23,7 +38,7 @@ 
 * Emulex

 * 3333 Susan Street

 * Costa Mesa, CA 92626

 *******************************************************************/

 */



#include <net/neighbour.h>

#include <net/netevent.h>

drivers/infiniband/hw/ocrdma/ocrdma_ah.h

+34 −19
Original line number Diff line number Diff line 
/*******************************************************************

 * This file is part of the Emulex RoCE Device Driver for          *

 * RoCE (RDMA over Converged Ethernet) adapters.                   *

 * Copyright (C) 2008-2012 Emulex. All rights reserved.            *

 * EMULEX and SLI are trademarks of Emulex.                        *

 * www.emulex.com                                                  *

 *                                                                 *

 * This program is free software; you can redistribute it and/or   *

 * modify it under the terms of version 2 of the GNU General       *

 * Public License as published by the Free Software Foundation.    *

 * This program is distributed in the hope that it will be useful. *

 * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND          *

 * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,  *

 * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE      *

 * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD *

 * TO BE LEGALLY INVALID.  See the GNU General Public License for  *

 * more details, a copy of which can be found in the file COPYING  *

 * included with this package.                                     *

/* This file is part of the Emulex RoCE Device Driver for

 * RoCE (RDMA over Converged Ethernet) adapters.

 * Copyright (C) 2012-2015 Emulex. All rights reserved.

 * EMULEX and SLI are trademarks of Emulex.

 * www.emulex.com

 *

 * This software is available to you under a choice of one of two licenses.

 * You may choose to be licensed under the terms of the GNU General Public

 * License (GPL) Version 2, available from the file COPYING in the main

 * directory of this source tree, or the BSD license below:

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * - Redistributions of source code must retain the above copyright notice,

 *   this list of conditions and the following disclaimer.

 *

 * - Redistributions in binary form must reproduce the above copyright

 *   notice, this list of conditions and the following disclaimer in

 *   the documentation and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 * Contact Information:

 * linux-drivers@emulex.com
@@ -23,7 +38,7 @@ 
 * Emulex

 * 3333 Susan Street

 * Costa Mesa, CA 92626

 *******************************************************************/

 */



#ifndef __OCRDMA_AH_H__

#define __OCRDMA_AH_H__