Skip to content

L
linux
Commit a20a361a authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge nuts.ninka.net:/home/davem/src/BK/network-2.5 

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents 9beb225e 595de9f9
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/net/3c59x.c
View file @ a20a361a
...@@ -2052,7 +2052,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -2052,7 +2052,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (skb->ip_summed != CHECKSUM_HW) if (skb->ip_summed != CHECKSUM_HW)
vp->tx_ring[entry].status = cpu_to_le32(skb->len | TxIntrUploaded); vp->tx_ring[entry].status = cpu_to_le32(skb->len | TxIntrUploaded);
else else
vp->tx_ring[entry].status = cpu_to_le32(skb->len | TxIntrUploaded | AddTCPChksum); vp->tx_ring[entry].status = cpu_to_le32(skb->len | TxIntrUploaded | AddTCPChksum | AddUDPChksum);
if (!skb_shinfo(skb)->nr_frags) { if (!skb_shinfo(skb)->nr_frags) {
vp->tx_ring[entry].frag[0].addr = cpu_to_le32(pci_map_single(vp->pdev, skb->data, vp->tx_ring[entry].frag[0].addr = cpu_to_le32(pci_map_single(vp->pdev, skb->data,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7