X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FNetwork%2FVIARhineII%2Frhine2.c;h=9bdbafb66f29ba81083150e34197b240cc8e03e6;hb=f0b5018caef356cda6afa147ddb6917068c62dd7;hp=be0e348b771c76e29fd23b2c9fb63e1e41b949ed;hpb=45444b9d268e6fbc9d5cf813e0b421536d86d508;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/Network/VIARhineII/rhine2.c b/KernelLand/Modules/Network/VIARhineII/rhine2.c
index be0e348b..9bdbafb6 100644
--- a/KernelLand/Modules/Network/VIARhineII/rhine2.c
+++ b/KernelLand/Modules/Network/VIARhineII/rhine2.c
@@ -36,7 +36,7 @@ typedef struct sCard
 	struct {
 		Uint32	Phys;
 		void	*Virt;
-	} RXBuffers[N_RX_PAGES];
+	} RXBuffers[N_RX_BUF_PAGES];
 
 	Uint32	DescTablePhys;
 	void	*DescTable;
@@ -80,7 +80,6 @@ int Rhine2_Install(char **Options)
 {
 	 int	id = -1;
 	 int	i = 0;
-//	Uint16	base;
 	tCard	*card;
 	
 	giRhine2_CardCount = PCI_CountDevices(VENDOR_ID, DEVICE_ID);
@@ -145,7 +144,7 @@ void Rhine2_int_InitialiseCard(tCard *Card)
 	
 	LOG("Allocaating RX buffers");
 	// Allocate memory for things
-	for( int i = 0; i < N_RX_PAGES; i ++ )
+	for( int i = 0; i < N_RX_BUF_PAGES; i ++ )
 	{
 		Card->RXBuffers[i].Virt = (void*)MM_AllocDMA(1, 32, &phys);
 		Card->RXBuffers[i].Phys = phys;
@@ -329,7 +328,7 @@ int Rhine2_SendPacket(void *Ptr, tIPStackBuffer *Buffer)
 	card->NextTX = (card->NextTX + nDescs) % N_TX_DESCS;
 	desc = card->TXDescs + first_desc_id;
 	
-	desc->TXBufferStart = MM_GetPhysAddr( (tVAddr)data );
+	desc->TXBufferStart = MM_GetPhysAddr( data );
 	desc->BufferSize = len | (1 << 15);
 	desc->TSR = 0;
 	desc->TCR = 0;
@@ -408,7 +407,7 @@ struct sRXDesc *Rhine2_int_GetDescFromPhys(tCard *Card, Uint32 Addr)
 
 void *Rhine2_int_GetBufferFromPhys(tCard *Card, Uint32 Addr)
 {
-	for( int i = 0; i < N_RX_PAGES; i ++ )
+	for( int i = 0; i < N_RX_BUF_PAGES; i ++ )
 	{
 		if( Card->RXBuffers[i].Phys > Addr )	continue;
 		if( Card->RXBuffers[i].Phys + PAGE_SIZE <= Addr )	continue;