From dc3a3fedaa9d058618d273cad02807b752322dc9 Mon Sep 17 00:00:00 2001 From: Casey Leedom Date: Tue, 29 Jun 2010 12:53:39 +0000 Subject: [PATCH] --- yaml --- r: 203241 b: refs/heads/master c: 64bb336c8f4de8b281d0d44f2ec2c900b9b28466 h: refs/heads/master i: 203239: 30cfe99d04d7d3613d9a824fd47088fe2afe3eea v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb4vf/sge.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index bf97e866ec67..69cec131f913 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6bebca92c663fb216c072193945946f3807ca7f +refs/heads/master: 64bb336c8f4de8b281d0d44f2ec2c900b9b28466 diff --git a/trunk/drivers/net/cxgb4vf/sge.c b/trunk/drivers/net/cxgb4vf/sge.c index f857d20e1d30..5c4a81dae19a 100644 --- a/trunk/drivers/net/cxgb4vf/sge.c +++ b/trunk/drivers/net/cxgb4vf/sge.c @@ -1301,18 +1301,7 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev) * wait for acks to really free up the data the extra memory * is even less. On the positive side we run the destructors * on the sending CPU rather than on a potentially different - * completing CPU, usually a good thing. We also run them - * without holding our TX queue lock, unlike what - * reclaim_completed_tx() would otherwise do. - * - * XXX Actually the above is somewhat incorrect since we don't - * XXX yet have a periodic timer which reclaims TX Descriptors. - * XXX What's our plan for this? - * XXX - * XXX Also, we don't currently have a TX Queue lock but - * XXX that may be the result of not having any current - * XXX asynchronous path for reclaiming completed TX - * XXX Descriptors ... + * completing CPU, usually a good thing. * * Run the destructor before telling the DMA engine about the * packet to make sure it doesn't complete and get freed