From: Ron Mercer <ron.mercer@qlogic.com>
Date: Mon, 26 Mar 2007 20:42:58 +0000 (-0700)
Subject: qla3xxx: bugfix: Multi segment sends were getting whacked.
X-Git-Tag: v2.6.21-rc6~80^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6967eb9cbf38643fc1b5432c36f610a9c565579;p=platform%2Fkernel%2Flinux-3.10.git

qla3xxx: bugfix: Multi segment sends were getting whacked.

The proper header length was not being used.

Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 5d358d3..9952e39 100755
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -2217,12 +2217,7 @@ static int ql_send_map(struct ql3_adapter *qdev,
 	int seg_cnt, seg = 0;
 	int frag_cnt = (int)skb_shinfo(skb)->nr_frags;
 
-	seg_cnt = tx_cb->seg_count = ql_get_seg_count(qdev,
-						      (skb_shinfo(skb)->nr_frags));
-	if(seg_cnt == -1) {
-		printk(KERN_ERR PFX"%s: invalid segment count!\n",__func__);
-		return NETDEV_TX_BUSY;
-	}
+	seg_cnt = tx_cb->seg_count;
 	/*
 	 * Map the skb buffer first.
 	 */
@@ -2278,7 +2273,7 @@ static int ql_send_map(struct ql3_adapter *qdev,
 				pci_unmap_addr_set(&tx_cb->map[seg], mapaddr,
 						   map);
 				pci_unmap_len_set(&tx_cb->map[seg], maplen,
-						  len);
+						  sizeof(struct oal));
 				oal_entry = (struct oal_entry *)oal;
 				oal++;
 				seg++;