X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fchelsio%2Fsge.c;h=30ff8ea1a402602761bb75994a092b759c662835;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=722be62f36e3e504278620b91842eb3b9985c6a2;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 722be62f3..30ff8ea1a 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1093,7 +1093,8 @@ static int process_responses(struct adapter *adapter, int budget)
 		if (likely(e->DataValid)) {
 			struct freelQ *fl = &sge->freelQ[e->FreelistQid];
 
-			BUG_ON(!e->Sop || !e->Eop);
+			if (unlikely(!e->Sop || !e->Eop))
+				BUG();
 			if (unlikely(e->Offload))
 				unexpected_offload(adapter, fl);
 			else
@@ -1418,7 +1419,7 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	struct cpl_tx_pkt *cpl;
 
 #ifdef NETIF_F_TSO
-	if (skb_is_gso(skb)) {
+	if (skb_shinfo(skb)->tso_size) {
 		int eth_type;
 		struct cpl_tx_pkt_lso *hdr;
 
@@ -1433,7 +1434,7 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		hdr->ip_hdr_words = skb->nh.iph->ihl;
 		hdr->tcp_hdr_words = skb->h.th->doff;
 		hdr->eth_type_mss = htons(MK_ETH_TYPE_MSS(eth_type,
-						skb_shinfo(skb)->gso_size));
+						skb_shinfo(skb)->tso_size));
 		hdr->len = htonl(skb->len - sizeof(*hdr));
 		cpl = (struct cpl_tx_pkt *)hdr;
 		sge->stats.tx_lso_pkts++;