Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efd51b5c authored by Ananda Raju's avatar Ananda Raju Committed by Jeff Garzik
Browse files

[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: default avatarAnanda Raju <ananda.raju@neterion.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent c35ca399

drivers/net/s2io.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3586,7 +3586,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) 
		txdp->Buffer_Pointer = (u64) pci_map_page

		txdp->Buffer_Pointer = (u64) pci_map_page

		    (sp->pdev, frag->page, frag->page_offset,

		    (sp->pdev, frag->page, frag->page_offset,

		     frag->size, PCI_DMA_TODEVICE);

		     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)

		if (skb_shinfo(skb)->ufo_size)

			txdp->Control_1 |= TXD_UFO_EN;

			txdp->Control_1 |= TXD_UFO_EN;

	}

	}