From owner-svn-src-all@FreeBSD.ORG  Wed Jul 17 13:41:55 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 74005ECF;
 Wed, 17 Jul 2013 13:41:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6707CFFD;
 Wed, 17 Jul 2013 13:41:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HDft3t098414;
 Wed, 17 Jul 2013 13:41:55 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6HDft4a098413;
 Wed, 17 Jul 2013 13:41:55 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201307171341.r6HDft4a098413@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 17 Jul 2013 13:41:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253423 - head/sys/ofed/drivers/net/mlx4
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jul 2013 13:41:55 -0000

Author: jhb
Date: Wed Jul 17 13:41:54 2013
New Revision: 253423
URL: http://svnweb.freebsd.org/changeset/base/253423

Log:
  Remove check forbidding requests that would result in one port being set
  to Ethernet and the subsequent port being set to IB.
  
  Submitted by:	Shakar Klein @ Mellanox
  Tested by:	Morgan Robertson <morganrobertson@gmail.com>
  MFC after:	1 week

Modified:
  head/sys/ofed/drivers/net/mlx4/main.c

Modified: head/sys/ofed/drivers/net/mlx4/main.c
==============================================================================
--- head/sys/ofed/drivers/net/mlx4/main.c	Wed Jul 17 13:24:10 2013	(r253422)
+++ head/sys/ofed/drivers/net/mlx4/main.c	Wed Jul 17 13:41:54 2013	(r253423)
@@ -209,9 +209,6 @@ int mlx4_check_port_params(struct mlx4_d
 					 "on this HCA, aborting.\n");
 				return -EINVAL;
 			}
-			if (port_type[i] == MLX4_PORT_TYPE_ETH &&
-			    port_type[i + 1] == MLX4_PORT_TYPE_IB)
-				return -EINVAL;
 		}
 	}