From owner-svn-src-stable-10@FreeBSD.ORG  Wed Nov 12 20:07:44 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F105980D;
 Wed, 12 Nov 2014 20:07:43 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DD7649C;
 Wed, 12 Nov 2014 20:07:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sACK7hkp066309;
 Wed, 12 Nov 2014 20:07:43 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sACK7hnr066308;
 Wed, 12 Nov 2014 20:07:43 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201411122007.sACK7hnr066308@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Wed, 12 Nov 2014 20:07:43 +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: r274443 - stable/10/sys/dev/cxgb/common
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-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Nov 2014 20:07:44 -0000

Author: np
Date: Wed Nov 12 20:07:43 2014
New Revision: 274443
URL: https://svnweb.freebsd.org/changeset/base/274443

Log:
  MFC r273280:
  
  cxgb(4): reset the PHY if it generates an interrupt for no apparent reason.

Modified:
  stable/10/sys/dev/cxgb/common/cxgb_ael1002.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/cxgb/common/cxgb_ael1002.c
==============================================================================
--- stable/10/sys/dev/cxgb/common/cxgb_ael1002.c	Wed Nov 12 20:01:10 2014	(r274442)
+++ stable/10/sys/dev/cxgb/common/cxgb_ael1002.c	Wed Nov 12 20:07:43 2014	(r274443)
@@ -1345,8 +1345,10 @@ static int ael2005_intr_handler(struct c
 		return ret;
 
 	ret |= cause;
-	if (!ret)
+	if (!ret) {
+		(void) ael2005_reset(phy, 0);
 		ret |= cphy_cause_link_change;
+	}
 	return ret;
 }