Message ID | 20091223095203.GA7824@ff.dom.local |
---|---|
State | RFC, archived |
Delegated to: | David Miller |
Headers | show |
On Wed, Dec 23, 2009 at 09:52:03AM +0000, Jarek Poplawski wrote: > BTW, it seems a change in 2.6.31 might trigger these timeouts more > often than before. Andrey, could you try if this matters here? They appear once per 4 seconds with or without this patch.
Andrey Rahmatullin wrote, On 12/23/2009 05:21 PM: > On Wed, Dec 23, 2009 at 09:52:03AM +0000, Jarek Poplawski wrote: >> BTW, it seems a change in 2.6.31 might trigger these timeouts more >> often than before. Andrey, could you try if this matters here? > They appear once per 4 seconds with or without this patch. > OK, thanks for checking this. Jarek P. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff -Nurp a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c --- a/drivers/net/via-rhine.c 2009-12-23 09:28:25.000000000 +0000 +++ b/drivers/net/via-rhine.c 2009-12-23 09:33:57.000000000 +0000 @@ -1226,6 +1226,7 @@ static void rhine_tx_timeout(struct net_ mdio_read(dev, rp->mii_if.phy_id, MII_BMSR)); schedule_work(&rp->reset_task); + netdev_get_tx_queue(dev, 0)->trans_start = jiffies; } static netdev_tx_t rhine_start_tx(struct sk_buff *skb,