diff -ru RT2500-Linux-STA-1.4.3.0.orig/STA/Module/rtmp_main.c RT2500-Linux-STA-1.4.3.0/STA/Module/rtmp_main.c
--- RT2500-Linux-STA-1.4.3.0.orig/STA/Module/rtmp_main.c	2004-09-15 05:46:42.000000000 +0200
+++ RT2500-Linux-STA-1.4.3.0/STA/Module/rtmp_main.c	2004-09-26 18:19:30.892326832 +0200
@@ -101,7 +101,7 @@
     RTMP_ADAPTER            *pAd;
     CHAR                    *print_name;
     INT                     chip_id = (int) ent->driver_data;
-    ULONG                   csr_addr;
+    unsigned long           csr_addr;
     CSR3_STRUC              StaMacReg0;
     CSR4_STRUC              StaMacReg1;
     INT                     Status;
@@ -128,7 +128,7 @@
     net_dev->irq = pPci_Dev->irq;
 
     // map physical address to virtual address for accessing register
-    csr_addr = (ULONG) ioremap(pci_resource_start(pPci_Dev, 0), pci_resource_len(pPci_Dev, 0));
+    csr_addr = (unsigned long) ioremap(pci_resource_start(pPci_Dev, 0), pci_resource_len(pPci_Dev, 0));
     if (!csr_addr) 
     {
         DBGPRINT(RT_DEBUG_TRACE, "ioremap failed for device %s, region 0x%X @ 0x%lX\n",
@@ -139,7 +139,7 @@
     // Save CSR virtual address and irq to device structure
     net_dev->base_addr = csr_addr;
     pAd = net_dev->priv;
-    pAd->CSRBaseAddress = csr_addr;
+    pAd->CSRBaseAddress = net_dev->base_addr;
     pAd->net_dev = net_dev;
 
     // Set DMA master
diff -ru RT2500-Linux-STA-1.4.3.0.orig/STA/Module/rtmp_tkip.c RT2500-Linux-STA-1.4.3.0/STA/Module/rtmp_tkip.c
--- RT2500-Linux-STA-1.4.3.0.orig/STA/Module/rtmp_tkip.c	2004-09-15 05:46:42.000000000 +0200
+++ RT2500-Linux-STA-1.4.3.0/STA/Module/rtmp_tkip.c	2004-09-26 18:21:29.819247192 +0200
@@ -124,7 +124,7 @@
     M = pTkip->M;
     
     // Alignment case
-    if((nBytesInM == 0) && ((((ULONG)pSrc) & 0x3) == 0))
+    if((nBytesInM == 0) && ((((unsigned long)pSrc) & 0x3) == 0))
     {
         while(nBytes >= 4)
         {