From 15b1f49048f147d3476ec1ab0fbb1c54613f11a5 Mon Sep 17 00:00:00 2001 From: Greg Rose Date: Fri, 22 Jan 2010 22:47:00 +0000 Subject: [PATCH] --- yaml --- r: 183723 b: refs/heads/master c: a9ee25a2b87c8077042ce23d3231f67f026719b0 h: refs/heads/master i: 183721: 90ceb1fb9a9c17e8dc38eb47f2052c4ac1f37024 183719: 3b5be045368b09a7bbd62fe03113c701a13df992 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbevf/ixgbevf_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 85b68d4d7652..609e24ebfcc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 767081adbd920ce93e3f1cbe797d0631637f92b3 +refs/heads/master: a9ee25a2b87c8077042ce23d3231f67f026719b0 diff --git a/trunk/drivers/net/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ixgbevf/ixgbevf_main.c index 39544afdc57f..bd2fd4608ed7 100644 --- a/trunk/drivers/net/ixgbevf/ixgbevf_main.c +++ b/trunk/drivers/net/ixgbevf/ixgbevf_main.c @@ -956,10 +956,17 @@ static irqreturn_t ixgbevf_msix_mbx(int irq, void *data) struct ixgbevf_adapter *adapter = netdev_priv(netdev); struct ixgbe_hw *hw = &adapter->hw; u32 eicr; + u32 msg; eicr = IXGBE_READ_REG(hw, IXGBE_VTEICS); IXGBE_WRITE_REG(hw, IXGBE_VTEICR, eicr); + hw->mbx.ops.read(hw, &msg, 1); + + if ((msg & IXGBE_MBVFICR_VFREQ_MASK) == IXGBE_PF_CONTROL_MSG) + mod_timer(&adapter->watchdog_timer, + round_jiffies(jiffies + 10)); + return IRQ_HANDLED; }