diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:19:57 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:19:57 -0500 |
| commit | 97309d1a0bbdcb0813ea08574b4473d8e5416012 (patch) | |
| tree | 0dcbcf5aa5146147e0ac1d0c4b73b868a67d333b /drivers/net/s2io.c | |
| parent | b4ea75b649417606fd6b38710a2962ec9770e772 (diff) | |
| parent | efd51b5c6798d103e3aa683464aebb2019b62119 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 41c75616e913..da0d8a85acce 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -3586,7 +3586,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 3586 | txdp->Buffer_Pointer = (u64) pci_map_page | 3586 | txdp->Buffer_Pointer = (u64) pci_map_page |
| 3587 | (sp->pdev, frag->page, frag->page_offset, | 3587 | (sp->pdev, frag->page, frag->page_offset, |
| 3588 | frag->size, PCI_DMA_TODEVICE); | 3588 | frag->size, PCI_DMA_TODEVICE); |
| 3589 | txdp->Control_1 |= TXD_BUFFER0_SIZE(frag->size); | 3589 | txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size); |
| 3590 | if (skb_shinfo(skb)->ufo_size) | 3590 | if (skb_shinfo(skb)->ufo_size) |
| 3591 | txdp->Control_1 |= TXD_UFO_EN; | 3591 | txdp->Control_1 |= TXD_UFO_EN; |
| 3592 | } | 3592 | } |