svn commit: r315903 - head/sys/dev/e1000

[Sean Bruno]

Author: sbruno
Date: Fri Mar 24 14:25:56 2017
New Revision: 315903
URL: https://svnweb.freebsd.org/changeset/base/315903

Log:
  Add missing 'else' to 3-state conditional during setup of interrupts.
  
  We don't want to overwrite the 82574 interrupt setup with a different
  configuration.
  
  PR:		218041
  Submitted by:	razmyslov at viva64.com

Modified:
  head/sys/dev/e1000/if_em.c

Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c	Fri Mar 24 14:19:52 2017	(r315902)
+++ head/sys/dev/e1000/if_em.c	Fri Mar 24 14:25:56 2017	(r315903)
@@ -1941,10 +1941,11 @@ em_if_msix_intr_assign(if_ctx_t ctx, int
 			tx_que->eims = 1 << (22 + i);
 			adapter->ims |= tx_que->eims;
 			adapter->ivars |= (8 | tx_que->msix) << (8 + (i * 4));
-		} if (adapter->hw.mac.type == e1000_82575)
+		} else if (adapter->hw.mac.type == e1000_82575) {
 			tx_que->eims = E1000_EICR_TX_QUEUE0 << (i %  adapter->tx_num_queues);
-		else
+		} else {
 			tx_que->eims = 1 << (i %  adapter->tx_num_queues);
+		}
 	}
 
 	/* Link interrupt */