patch-2.4.15 linux/drivers/net/8139cp.c

• Lines: 60
• Date: Mon Nov 19 15:19:42 2001
• Orig file: v2.4.14/linux/drivers/net/8139cp.c
• Orig date: Mon Nov 5 15:55:30 2001

diff -u --recursive --new-file v2.4.14/linux/drivers/net/8139cp.c linux/drivers/net/8139cp.c
@@ -625,6 +625,10 @@
 		len = skb->len;
 		mapping = pci_map_single(cp->pdev, skb->data, len, PCI_DMA_TODEVICE);
 		eor = (entry == (CP_TX_RING_SIZE - 1)) ? RingEnd : 0;
+		txd->opts2 = 0;
+		txd->addr_lo = cpu_to_le32(mapping);
+		wmb();
+
 #ifdef CP_TX_CHECKSUM
 		txd->opts1 = cpu_to_le32(eor | len | DescOwn | FirstFrag |
 			LastFrag | IPCS | UDPCS | TCPCS);
@@ -632,13 +636,11 @@
 		txd->opts1 = cpu_to_le32(eor | len | DescOwn | FirstFrag |
 			LastFrag);
 #endif
-		txd->opts2 = 0;
-		txd->addr_lo = cpu_to_le32(mapping);
+		wmb();
 
 		cp->tx_skb[entry].skb = skb;
 		cp->tx_skb[entry].mapping = mapping;
 		cp->tx_skb[entry].frag = 0;
-		wmb();
 		entry = NEXT_TX(entry);
 	} else {
 		struct cp_desc *txd;
@@ -676,24 +678,29 @@
 				ctrl |= LastFrag;
 
 			txd = &cp->tx_ring[entry];
-			txd->opts1 = cpu_to_le32(ctrl);
 			txd->opts2 = 0;
 			txd->addr_lo = cpu_to_le32(mapping);
+			wmb();
+
+			txd->opts1 = cpu_to_le32(ctrl);
+			wmb();
 
 			cp->tx_skb[entry].skb = skb;
 			cp->tx_skb[entry].mapping = mapping;
 			cp->tx_skb[entry].frag = frag + 2;
-			wmb();
 			entry = NEXT_TX(entry);
 		}
+
 		txd = &cp->tx_ring[first_entry];
+		txd->opts2 = 0;
+		txd->addr_lo = cpu_to_le32(first_mapping);
+		wmb();
+
 #ifdef CP_TX_CHECKSUM
 		txd->opts1 = cpu_to_le32(first_len | FirstFrag | DescOwn | IPCS | UDPCS | TCPCS);
 #else
 		txd->opts1 = cpu_to_le32(first_len | FirstFrag | DescOwn);
 #endif
-		txd->opts2 = 0;
-		txd->addr_lo = cpu_to_le32(first_mapping);
 		wmb();
 	}
 	cp->tx_head = entry;