From c7daa91517723aa9c13273e4154dc63bd88a259d Mon Sep 17 00:00:00 2001 From: Jacob Keller Date: Sat, 1 Dec 2012 07:57:17 +0000 Subject: [PATCH] --- yaml --- r: 351643 b: refs/heads/master c: 12ff3f3b6c21fe8f4628b834919b393eb14aa7b2 h: refs/heads/master i: 351641: 1b993dbd5b78bdad977bcb322bf26bde4c665816 351639: bd9fd3f618843c8f06737b85d101950fec9dbc6b v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ed46771496bb..7a0baf860e14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 891dc0821d2089afcb04d3cace0a3522093680e7 +refs/heads/master: 12ff3f3b6c21fe8f4628b834919b393eb14aa7b2 diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 4c2e9d6564ad..7e0bb9536b1d 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -803,6 +803,7 @@ static void ixgbe_tx_timeout_reset(struct ixgbe_adapter *adapter) /* Do the reset outside of interrupt context */ if (!test_bit(__IXGBE_DOWN, &adapter->state)) { adapter->flags2 |= IXGBE_FLAG2_RESET_REQUESTED; + e_warn(drv, "initiating reset due to tx timeout\n"); ixgbe_service_event_schedule(adapter); } } @@ -5613,6 +5614,7 @@ static void ixgbe_watchdog_flush_tx(struct ixgbe_adapter *adapter) * to get done, so reset controller to flush Tx. * (Do the reset outside of interrupt context). */ + e_warn(drv, "initiating reset to clear Tx work after link loss\n"); adapter->flags2 |= IXGBE_FLAG2_RESET_REQUESTED; } }