From 9a9165554401c9ff9b24d85617978027b4235c97 Mon Sep 17 00:00:00 2001 From: Don Skidmore Date: Wed, 17 Aug 2011 10:15:21 +0000 Subject: [PATCH] --- yaml --- r: 266212 b: refs/heads/master c: f3df98ec9e8ed127456a601f99619c88e9d6017f h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9a239827ace6..858f1dd74802 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f51bf702395ab45aa68e6b702df2728cc7fe344 +refs/heads/master: f3df98ec9e8ed127456a601f99619c88e9d6017f diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 79636eaeb74d..3f5c5a4291a6 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -3680,8 +3680,18 @@ static void ixgbe_setup_gpie(struct ixgbe_adapter *adapter) } /* Enable Thermal over heat sensor interrupt */ - if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) - gpie |= IXGBE_SDP0_GPIEN; + if (adapter->flags2 & IXGBE_FLAG2_TEMP_SENSOR_CAPABLE) { + switch (adapter->hw.mac.type) { + case ixgbe_mac_82599EB: + gpie |= IXGBE_SDP0_GPIEN; + break; + case ixgbe_mac_X540: + gpie |= IXGBE_EIMS_TS; + break; + default: + break; + } + } /* Enable fan failure interrupt */ if (adapter->flags & IXGBE_FLAG_FAN_FAIL_CAPABLE)