From owner-svn-src-stable@freebsd.org  Thu Jan 14 15:29:41 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F15A4A82300;
 Thu, 14 Jan 2016 15:29:41 +0000 (UTC)
 (envelope-from arybchik@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 BE0FA1A04;
 Thu, 14 Jan 2016 15:29:41 +0000 (UTC)
 (envelope-from arybchik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0EFTeYt043502;
 Thu, 14 Jan 2016 15:29:40 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0EFTe1n043501;
 Thu, 14 Jan 2016 15:29:40 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201601141529.u0EFTe1n043501@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arybchik set sender to
 arybchik@FreeBSD.org using -f
From: Andrew Rybchenko <arybchik@FreeBSD.org>
Date: Thu, 14 Jan 2016 15:29:40 +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: r293965 - stable/10/sys/dev/sfxge/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@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jan 2016 15:29:42 -0000

Author: arybchik
Date: Thu Jan 14 15:29:40 2016
New Revision: 293965
URL: https://svnweb.freebsd.org/changeset/base/293965

Log:
  MFC r292009
  
  sfxge: cleanup: fix (unused) EFX_OR_BYTE macro
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/common/efx_types.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/common/efx_types.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_types.h	Thu Jan 14 15:28:46 2016	(r293964)
+++ stable/10/sys/dev/sfxge/common/efx_types.h	Thu Jan 14 15:29:40 2016	(r293965)
@@ -1584,7 +1584,7 @@ extern int fix_lint;
 
 #define	EFX_OR_BYTE(_byte1, _byte2)					\
 	do {								\
-		(_byte1).eb_u8[0] &= (_byte2).eb_u8[0];			\
+		(_byte1).eb_u8[0] |= (_byte2).eb_u8[0];			\
 	_NOTE(CONSTANTCONDITION) 					\
 	} while (B_FALSE)