]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ixgbe: cleanup X540 interrupt enablement
authorDon Skidmore <donald.c.skidmore@intel.com>
Thu, 4 Aug 2011 09:28:30 +0000 (09:28 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 14:10:59 +0000 (22:10 +0800)
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>
drivers/net/ixgbe/ixgbe_main.c

index 7b152858f141fb7b3ff0dd5dc1f570aff728ae56..5c9f1ee36b0f3d1a0c85a7774d4473f00fbffc39 100644 (file)
@@ -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: