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>

diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ixgbe/ixgbe_mbx.c
index c7ed82eb2539aae89bb63589a23c68dce72bb898..1ff0eefcfd0ac13d6d044bcc5d2c0c04c3c7e3d9 100644 (file)
--- 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;
 }