commit efd51b5c6798d103e3aa683464aebb2019b62119
author Ananda Raju <Ananda.Raju@neterion.com> Thu Jan 19 14:11:54 2006 -0500
committer Jeff Garzik <jgarzik@pobox.com> Thu Jan 26 22:11:26 2006 -0500
tree 6fc73a21929fbce1bc4050b8b90a9312a0bfa99e
parent c35ca399e09828f3f6b40c0007a95a6582d90347

[PATCH] s2io: scatter-gather fix

	There is a problem with fragmented skb in s2io driver version 2.0.9.4
	available in 2.6.16-rc1 kernel. The adapter will fail to transmit if
	any scatter-gather skb arrives.  This patch provides fix for the above
	described problem.

Signed-off-by: Ananda Raju <ananda.raju@neterion.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

drivers/net/s2io.c

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 89c4678..49b597c 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3586,7 +3586,7 @@
 		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;
 	}