Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 89c46787676c..49b597cbc19a 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;
         }