patch-2.4.0-test2 linux/drivers/net/tokenring/ibmtr.c

• Lines: 32
• Date: Mon Jun 19 13:42:39 2000
• Orig file: v2.4.0-test1/linux/drivers/net/tokenring/ibmtr.c
• Orig date: Fri May 12 14:18:55 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/net/tokenring/ibmtr.c linux/drivers/net/tokenring/ibmtr.c
@@ -781,6 +781,9 @@
 {
 	struct tok_info *ti=(struct tok_info *)dev->priv;
 
+	/* init the spinlock */
+	spin_lock_init(&ti->lock);
+
 	SET_PAGE(ti->srb_page);
 	ti->open_status		= CLOSED;
 
@@ -846,9 +849,6 @@
 {
 	struct tok_info *ti=(struct tok_info *)dev->priv;
 
-	/* init the spinlock */
-	spin_lock_init(&ti->lock);
-
 	if (ti->open_status==CLOSED) tok_init_card(dev);
 
 	if (ti->open_status==IN_PROGRESS) sleep_on(&ti->wait_for_reset);
@@ -1750,9 +1750,9 @@
 	/* Copy the payload... */
 	for (;;) {
 		if (IPv4_p)
-			chksum = csum_partial_copy_generic(bus_to_virt(rbufdata), data,
+			chksum = csum_partial_copy_nocheck(bus_to_virt(rbufdata), data,
 						   length < rbuffer_len ? length : rbuffer_len,
-						   chksum, NULL, NULL);
+						   chksum);
 		else
 			isa_memcpy_fromio(data, rbufdata, rbuffer_len);
 		rbuffer = ntohs(isa_readw(rbuffer));