Divy Le Ray wrote:
quoted text
> Jeff Garzik wrote:
>> Mostly fixes, a few cleanups (generally assisting fixes), and an
>> exception for PS3 wireless because it had been posted, reviewed and
>> acked for a while, just not committed.
>>
>> Please pull from 'upstream-davem' branch of
>> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git 
>> upstream-davem
>>
>> to receive the following updates:
>>
>>  
>>  drivers/net/cxgb3/sge.c          |   35 +-
>>    
>> diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
>> index 9ca8c66..979f3fc 100644
>> --- a/drivers/net/cxgb3/sge.c
>> +++ b/drivers/net/cxgb3/sge.c
>> @@ -1059,6 +1059,14 @@ static void write_tx_pkt_wr(struct adapter 
>> *adap, struct sk_buff *skb,
>>               htonl(V_WR_TID(q->token)));
>>  }
>>  
>> +static inline void t3_stop_queue(struct net_device *dev, struct 
>> sge_qset *qs,
>> +                 struct sge_txq *q)
>> +{
>> +    netif_stop_queue(dev);
>> +    set_bit(TXQ_ETH, &qs->txq_stopped);
>> +    q->stops++;
>> +}
>> +
>>  /**
>>   *    eth_xmit - add a packet to the Ethernet Tx queue
>>   *    @skb: the packet
>> @@ -1090,31 +1098,18 @@ int t3_eth_xmit(struct sk_buff *skb, struct 
>> net_device *dev)
>>      ndesc = calc_tx_descs(skb);
>>  
>>      if (unlikely(credits < ndesc)) {
>> -        if (!netif_queue_stopped(dev)) {
>> -            netif_stop_queue(dev);
>> -            set_bit(TXQ_ETH, &qs->txq_stopped);
>> -            q->stops++;
>> -            dev_err(&adap->pdev->dev,
>> -                "%s: Tx ring %u full while queue awake!\n",
>> -                dev->name, q->cntxt_id & 7);
>> -        }
>> +        t3_stop_queue(dev, qs, q);
>> +        dev_err(&adap->pdev->dev,
>> +            "%s: Tx ring %u full while queue awake!\n",
>> +            dev->name, q->cntxt_id & 7);
>>          spin_unlock(&q->lock);
>>          return NETDEV_TX_BUSY;
>>      }
>>  
>>      q->in_use += ndesc;
>> -    if (unlikely(credits - ndesc < q->stop_thres)) {
>> -        q->stops++;
>> -        netif_stop_queue(dev);
>> -        set_bit(TXQ_ETH, &qs->txq_stopped);
>> -#if !USE_GTS
>> -        if (should_restart_tx(q) &&
>> -            test_and_clear_bit(TXQ_ETH, &qs->txq_stopped)) {
>> -            q->restarts++;
>> -            netif_wake_queue(dev);
>> -        }
>> -#endif
>> -    }
>> +    if (unlikely(credits - ndesc < q->stop_thres))
>> +        if (USE_GTS || !should_restart_tx(q))
>> +            t3_stop_queue(dev, qs, q);
>>  
>>      gen = q->gen;
>>      q->unacked += ndesc;
>>   
> Hi Jeff,
> 
> I thought I had NAK'ed the patch modifying sge.c from Krishna Kumar.
> Looking back at my answer at the time, I was obviously unclear.
> Can you please revert the drivers/net/cxgb3sge.c change ?

Explain why, so I can include it in the changelog please...

	Jeff




--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/