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

Next file: linux/drivers/net/tokenring/Config.in
Previous file: linux/drivers/net/sunlance.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.40/linux/drivers/net/sunqe.c linux/drivers/net/sunqe.c
@@ -833,10 +833,10 @@
 			goto qec_free_devs;
 		}
 
-		qeps[i]->qe_block = sbus_alloc_consistant(qesdevs[i],
+		qeps[i]->qe_block = sbus_alloc_consistent(qesdevs[i],
 							  PAGE_SIZE,
 							  &qeps[i]->qblock_dvma);
-		qeps[i]->buffers = sbus_alloc_consistant(qesdevs[i],
+		qeps[i]->buffers = sbus_alloc_consistent(qesdevs[i],
 							 sizeof(struct sunqe_buffers),
 							 &qeps[i]->buffers_dvma);
 		if (qeps[i]->qe_block == NULL ||
@@ -907,12 +907,12 @@
 				if (qe->mregs)
 					sbus_iounmap(qe->mregs, MREGS_REG_SIZE);
 				if (qe->qe_block != NULL)
-					sbus_free_consistant(qe->qe_sdev,
+					sbus_free_consistent(qe->qe_sdev,
 							     PAGE_SIZE,
 							     qe->qe_block,
 							     qe->qblock_dvma);
 				if (qe->buffers != NULL)
-					sbus_free_consistant(qe->qe_sdev,
+					sbus_free_consistent(qe->qe_sdev,
 							     sizeof(struct sunqe_buffers),
 							     qe->buffers,
 							     qe->buffers_dvma);
@@ -1006,11 +1006,11 @@
 			unregister_netdev(root_qec_dev->qes[i]->dev);
 			sbus_iounmap(root_qec_dev->qes[i]->qcregs, CREG_REG_SIZE);
 			sbus_iounmap(root_qec_dev->qes[i]->mregs, MREGS_REG_SIZE);
-			sbus_free_consistant(root_qec_dev->qes[i]->qe_sdev,
+			sbus_free_consistent(root_qec_dev->qes[i]->qe_sdev,
 					     PAGE_SIZE,
 					     root_qec_dev->qes[i]->qe_block,
 					     root_qec_dev->qes[i]->qblock_dvma);
-			sbus_free_consistant(root_qec_dev->qes[i]->qe_sdev,
+			sbus_free_consistent(root_qec_dev->qes[i]->qe_sdev,
 					     sizeof(struct sunqe_buffers),
 					     root_qec_dev->qes[i]->buffers,
 					     root_qec_dev->qes[i]->buffers_dvma);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)