From owner-svn-src-stable@FreeBSD.ORG  Sun Nov 17 01:07:47 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 34A321AB;
 Sun, 17 Nov 2013 01:07:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2292A2EC0;
 Sun, 17 Nov 2013 01:07:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAH17lEm051527;
 Sun, 17 Nov 2013 01:07:47 GMT (envelope-from alfred@svn.freebsd.org)
Received: (from alfred@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAH17kDe051526;
 Sun, 17 Nov 2013 01:07:46 GMT (envelope-from alfred@svn.freebsd.org)
Message-Id: <201311170107.rAH17kDe051526@svn.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Sun, 17 Nov 2013 01:07:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r258242 - stable/10/sys/ofed/drivers/net/mlx4
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Nov 2013 01:07:47 -0000

Author: alfred
Date: Sun Nov 17 01:07:46 2013
New Revision: 258242
URL: http://svnweb.freebsd.org/changeset/base/258242

Log:
  MFC: 257542
  
  Fix API mismatch exposed by lagg.
  
  When destroying a lagg the driver tries to restore the old mac and
  fails due to API mismatch.
  
  Submitted by:   Shahar Klein (shahark at mellanox.com)
  Approved by:     re

Modified:
  stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c
Directory Properties:
  stable/10/sys/   (props changed)

Modified: stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c
==============================================================================
--- stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c	Sun Nov 17 00:49:55 2013	(r258241)
+++ stable/10/sys/ofed/drivers/net/mlx4/en_netdev.c	Sun Nov 17 01:07:46 2013	(r258242)
@@ -604,8 +604,8 @@ int mlx4_en_start_port(struct net_device
 	en_dbg(DRV, priv, "Setting mac for port %d\n", priv->port);
 	err = mlx4_register_mac(mdev->dev, priv->port,
 				mlx4_en_mac_to_u64(IF_LLADDR(dev)));
-	if (err) {
-		en_err(priv, "Failed setting port mac\n");
+	if (err < 0) {
+		en_err(priv, "Failed setting port mac err=%d\n", err);
 		goto tx_err;
 	}
 	mdev->mac_removed[priv->port] = 0;