patch-2.1.29 linux/drivers/net/sunqe.c

Next file: linux/drivers/net/sunqe.h
Previous file: linux/drivers/net/sunlance.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.28/linux/drivers/net/sunqe.c linux/drivers/net/sunqe.c
@@ -777,7 +777,7 @@
 	/* Get it going. */
 	qep->qcregs->ctrl = CREG_CTRL_TWAKEUP;
 
-	qep->stats.tx_bytes+=skb->len;
+	qep->net_stats.tx_bytes+=skb->len;
 	
 	dev_kfree_skb(skb, FREE_WRITE);
 
@@ -980,11 +980,13 @@
 			qesdevs[i]->reg_addrs[j].phys_addr += qranges[k].ot_parent_base;
 		}
 
-		prom_apply_sbus_ranges(qesdevs[i]->my_bus, &qesdevs[i]->reg_addrs[0], 2);
+		prom_apply_sbus_ranges(qesdevs[i]->my_bus, &qesdevs[i]->reg_addrs[0],
+				       2, qesdevs[i]);
 	}
 
 	/* Now map in the registers, QEC globals first. */
-	prom_apply_sbus_ranges(sdev->my_bus, &sdev->reg_addrs[0], sdev->num_registers);
+	prom_apply_sbus_ranges(sdev->my_bus, &sdev->reg_addrs[0],
+			       sdev->num_registers, sdev);
 	qecp->gregs = sparc_alloc_io(sdev->reg_addrs[0].phys_addr, 0,
 				     sizeof(struct qe_globreg),
 				     "QEC Global Registers",

FUNET's LINUX-ADM group, [email protected]
TCL-scripts by Sam Shen, [email protected]