From owner-svn-src-stable-8@FreeBSD.ORG  Wed Sep 10 06:56:10 2014
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@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 6017DFAF;
 Wed, 10 Sep 2014 06:56:10 +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 4B3CB156;
 Wed, 10 Sep 2014 06:56:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8A6uAJH067921;
 Wed, 10 Sep 2014 06:56:10 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8A6uAtn067920;
 Wed, 10 Sep 2014 06:56:10 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201409100656.s8A6uAtn067920@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 10 Sep 2014 06:56:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r271357 - stable/8/sys/dev/usb/net
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
 <svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-8>, 
 <mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8/>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
 <mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Sep 2014 06:56:10 -0000

Author: hselasky
Date: Wed Sep 10 06:56:09 2014
New Revision: 271357
URL: http://svnweb.freebsd.org/changeset/base/271357

Log:
  MFC r270992:
  Fix logical error.

Modified:
  stable/8/sys/dev/usb/net/if_aue.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/usb/   (props changed)

Modified: stable/8/sys/dev/usb/net/if_aue.c
==============================================================================
--- stable/8/sys/dev/usb/net/if_aue.c	Wed Sep 10 06:54:05 2014	(r271356)
+++ stable/8/sys/dev/usb/net/if_aue.c	Wed Sep 10 06:56:09 2014	(r271357)
@@ -747,7 +747,7 @@ aue_intr_callback(struct usb_xfer *xfer,
 
 			if (pkt.aue_txstat0)
 				ifp->if_oerrors++;
-			if (pkt.aue_txstat0 & (AUE_TXSTAT0_LATECOLL &
+			if (pkt.aue_txstat0 & (AUE_TXSTAT0_LATECOLL |
 			    AUE_TXSTAT0_EXCESSCOLL))
 				ifp->if_collisions++;
 		}