From 138534d48b330842afe2deba4e3aff49ebdb674f Mon Sep 17 00:00:00 2001 From: Ananda Raju Date: Thu, 19 Jan 2006 14:11:54 -0500 Subject: [PATCH] --- yaml --- r: 19059 b: refs/heads/master c: efd51b5c6798d103e3aa683464aebb2019b62119 h: refs/heads/master i: 19057: dfc0620fa1019cbe437f5e5c3357360ca509d893 19055: e2dc61eb65cbc8f322507b842bb6b0d967e9486b v: v3 --- [refs] | 2 +- trunk/drivers/net/s2io.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9951d57449ae..f6bc4b14f2bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c35ca399e09828f3f6b40c0007a95a6582d90347 +refs/heads/master: efd51b5c6798d103e3aa683464aebb2019b62119 diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c index 89c46787676c..49b597cbc19a 100644 --- a/trunk/drivers/net/s2io.c +++ b/trunk/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; }