patch-2.2.0-pre9 linux/drivers/net/tulip.c

Next file: linux/drivers/pci/pci.c
Previous file: linux/drivers/net/irda/uircc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.0-pre8/linux/drivers/net/tulip.c linux/drivers/net/tulip.c
@@ -279,7 +279,7 @@
 	HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM,
 	tulip_timer },
   { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_21142,
-	"Digital DS21142/3 Tulip", 256, 0x0801fbff,
+	"Digital DS21142/3 Tulip", 128, 0x0801fbff,
 	HAS_MII | HAS_MEDIA_TABLE, t21142_timer },
   { PCI_VENDOR_ID_LITEON, 0x0002,
 	"Lite-On 82c168 PNIC", 256, 0x0001ebef, HAS_MII, pnic_timer },
@@ -2397,7 +2397,6 @@
 				memcpy(skb_put(skb, pkt_len),
 					   bus_to_virt(tp->rx_ring[entry].buffer1), pkt_len);
 #else
-#warning Code untested
 				eth_copy_and_sum(skb, bus_to_virt(tp->rx_ring[entry].buffer1),
 								 pkt_len, 0);
 				skb_put(skb, pkt_len);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov