svn commit: r293965 - stable/10/sys/dev/sfxge/common

[Andrew Rybchenko]

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)