diff options
| author | Emil Tantilov <emil.s.tantilov@intel.com> | 2011-03-04 03:20:59 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-03-12 04:13:41 -0800 |
| commit | 7e7eb4346329da3b9fd4b8d4a5a66d327d9fff6c (patch) | |
| tree | b0b6782157d5eff5e3b7480ec50c7abc586fcbdc | |
| parent | c27931da83bc486e192c8dfdab903ba51e176c54 (diff) | |
| download | linux-stable-7e7eb4346329da3b9fd4b8d4a5a66d327d9fff6c.tar.gz linux-stable-7e7eb4346329da3b9fd4b8d4a5a66d327d9fff6c.tar.bz2 linux-stable-7e7eb4346329da3b9fd4b8d4a5a66d327d9fff6c.zip | |
ixgbe: remove timer reset to 0 on timeout
The VF mailbox polling for acks and messages would reset the timer to zero
on a timeout. Under heavy load a timeout may actually occur without being
the result of an error and when this occurs it is not practical to perform
a full VF driver reset on every message timeout. Instead, just return an
error (which is already done) and the VF driver will have an opportunity
to retry the operation.
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Acked-by: Greg Rose <gregory.v.rose@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_mbx.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ixgbe/ixgbe_mbx.c index c7ed82eb2539..1ff0eefcfd0a 100644 --- a/drivers/net/ixgbe/ixgbe_mbx.c +++ b/drivers/net/ixgbe/ixgbe_mbx.c @@ -154,9 +154,6 @@ static s32 ixgbe_poll_for_msg(struct ixgbe_hw *hw, u16 mbx_id) udelay(mbx->usec_delay); } - /* if we failed, all future posted messages fail until reset */ - if (!countdown) - mbx->timeout = 0; out: return countdown ? 0 : IXGBE_ERR_MBX; } @@ -183,9 +180,6 @@ static s32 ixgbe_poll_for_ack(struct ixgbe_hw *hw, u16 mbx_id) udelay(mbx->usec_delay); } - /* if we failed, all future posted messages fail until reset */ - if (!countdown) - mbx->timeout = 0; out: return countdown ? 0 : IXGBE_ERR_MBX; } |