diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 10:29:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 10:29:35 -0800 |
| commit | 0827f2b698735aee7cfb2990d393a82f6e1690eb (patch) | |
| tree | 5eb1fa871154ab36c38794c4dc488698f13c71e0 /drivers/net/s2io.c | |
| parent | 70b4d63e98fd93fb9742708a54f872cba24e0fea (diff) | |
| parent | c6f0d75a2defe8c7d8bf9f78de891cedc46b4b3e (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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 89c46787676..49b597cbc19 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) txdp->Buffer_Pointer = (u64) pci_map_page (sp->pdev, frag->page, frag->page_offset, frag->size, PCI_DMA_TODEVICE); - txdp->Control_1 |= TXD_BUFFER0_SIZE(frag->size); + txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size); if (skb_shinfo(skb)->ufo_size) txdp->Control_1 |= TXD_UFO_EN; } |