lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream-fixes'

Browse Source
This commit is contained in:
Jeff Garzik
2006-01-26 22:19:57 -05:00
parent b4ea75b649 efd51b5c67
commit 97309d1a0b
346 changed files with 13886 additions and 4676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/s2io.c
View File

@ -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;
}