mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
qlge: bugfix: Fix TSO breakage.
Moved the buffer mapping to a point after TSO logic has modified the iph->check field. We were seeing stale data on the PCIe bus. Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
06a3d510fa
commit
0d979f74a9
1 changed files with 6 additions and 4 deletions
|
@ -1936,10 +1936,6 @@ static int qlge_send(struct sk_buff *skb, struct net_device *ndev)
|
||||||
tx_ring_desc = &tx_ring->q[tx_ring->prod_idx];
|
tx_ring_desc = &tx_ring->q[tx_ring->prod_idx];
|
||||||
mac_iocb_ptr = tx_ring_desc->queue_entry;
|
mac_iocb_ptr = tx_ring_desc->queue_entry;
|
||||||
memset((void *)mac_iocb_ptr, 0, sizeof(mac_iocb_ptr));
|
memset((void *)mac_iocb_ptr, 0, sizeof(mac_iocb_ptr));
|
||||||
if (ql_map_send(qdev, mac_iocb_ptr, skb, tx_ring_desc) != NETDEV_TX_OK) {
|
|
||||||
QPRINTK(qdev, TX_QUEUED, ERR, "Could not map the segments.\n");
|
|
||||||
return NETDEV_TX_BUSY;
|
|
||||||
}
|
|
||||||
|
|
||||||
mac_iocb_ptr->opcode = OPCODE_OB_MAC_IOCB;
|
mac_iocb_ptr->opcode = OPCODE_OB_MAC_IOCB;
|
||||||
mac_iocb_ptr->tid = tx_ring_desc->index;
|
mac_iocb_ptr->tid = tx_ring_desc->index;
|
||||||
|
@ -1965,6 +1961,12 @@ static int qlge_send(struct sk_buff *skb, struct net_device *ndev)
|
||||||
ql_hw_csum_setup(skb,
|
ql_hw_csum_setup(skb,
|
||||||
(struct ob_mac_tso_iocb_req *)mac_iocb_ptr);
|
(struct ob_mac_tso_iocb_req *)mac_iocb_ptr);
|
||||||
}
|
}
|
||||||
|
if (ql_map_send(qdev, mac_iocb_ptr, skb, tx_ring_desc) !=
|
||||||
|
NETDEV_TX_OK) {
|
||||||
|
QPRINTK(qdev, TX_QUEUED, ERR,
|
||||||
|
"Could not map the segments.\n");
|
||||||
|
return NETDEV_TX_BUSY;
|
||||||
|
}
|
||||||
QL_DUMP_OB_MAC_IOCB(mac_iocb_ptr);
|
QL_DUMP_OB_MAC_IOCB(mac_iocb_ptr);
|
||||||
tx_ring->prod_idx++;
|
tx_ring->prod_idx++;
|
||||||
if (tx_ring->prod_idx == tx_ring->wq_len)
|
if (tx_ring->prod_idx == tx_ring->wq_len)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue