diff options
| author | Ron Mercer <ron.mercer@qlogic.com> | 2007-03-26 13:42:58 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-03-28 02:18:50 -0400 |
| commit | b6967eb9cbf38643fc1b5432c36f610a9c565579 (patch) | |
| tree | 7b15a819388d017c6c14bd94cdd1a3437a20392c /drivers/net/qla3xxx.c | |
| parent | d8a759ff414141c8a0f6683e9f35b895b5f23b57 (diff) | |
| download | linux-b6967eb9cbf38643fc1b5432c36f610a9c565579.tar.gz linux-b6967eb9cbf38643fc1b5432c36f610a9c565579.tar.bz2 linux-b6967eb9cbf38643fc1b5432c36f610a9c565579.zip | |
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>
Diffstat (limited to 'drivers/net/qla3xxx.c')
| -rwxr-xr-x | drivers/net/qla3xxx.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index 5d358d3779de..9952e3931e34 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++; |