From: Don Skidmore <donald.c.skidmore@intel.com>
Date: Thu, 4 Aug 2011 09:28:30 +0000 (+0000)
Subject: ixgbe: cleanup X540 interrupt enablement
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~177
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0c2500981d693f4f462ab78511c66f8c152878a9;p=users%2Fjedix%2Flinux-maple.git

ixgbe: cleanup X540 interrupt enablement

We don't need SFP+ plugable support for X540 hardware (copper only) so
don't enable the SFP+ interrupts.

(cherry picked from commit 858bc081d3300eaef805e64d7105ed82ca1c5770)
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 7b152858f141..5c9f1ee36b0f 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1862,10 +1862,10 @@ static inline void ixgbe_irq_enable(struct ixgbe_adapter *adapter, bool queues,
 		mask |= IXGBE_EIMS_GPI_SDP1;
 	switch (adapter->hw.mac.type) {
 	case ixgbe_mac_82599EB:
-	case ixgbe_mac_X540:
-		mask |= IXGBE_EIMS_ECC;
 		mask |= IXGBE_EIMS_GPI_SDP1;
 		mask |= IXGBE_EIMS_GPI_SDP2;
+	case ixgbe_mac_X540:
+		mask |= IXGBE_EIMS_ECC;
 		mask |= IXGBE_EIMS_MAILBOX;
 		break;
 	default: