Attachment #40452 for bug #58483




    RTMP_ADAPTER            *pAd;
    CHAR                    *print_name;
    INT                     chip_id = (int) ent->driver_data;
    unsigned long           csr_addr;
    CSR3_STRUC              StaMacReg0;
    CSR4_STRUC              StaMacReg1;
    INT                     Status;

    net_dev->irq = pPci_Dev->irq;

    // map physical address to virtual address for accessing register
    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",

    // Save CSR virtual address and irq to device structure
    net_dev->base_addr = csr_addr;
    pAd = net_dev->priv;
    pAd->CSRBaseAddress = net_dev->base_addr;
    pAd->net_dev = net_dev;

    // Set DMA master

Lines 124-130 Link Here

(-)RT2500-Linux-STA-1.4.3.0.orig/STA/Module/rtmp_tkip.c (-1 / +1 lines)
124	M = pTkip->M;	124	M = pTkip->M;
125		125
126	// Alignment case	126	// Alignment case
127	if((nBytesInM == 0) && ((((ULONG)pSrc) & 0x3) == 0))	127	if((nBytesInM == 0) && ((((unsigned long)pSrc) & 0x3) == 0))
128	{	128	{
129	while(nBytes >= 4)	129	while(nBytes >= 4)
130	{	130	{

Return to bug 58483

Lines 101-107 Link Here

(-)RT2500-Linux-STA-1.4.3.0.orig/STA/Module/rtmp_main.c (-3 / +3 lines)
101	RTMP_ADAPTER *pAd;	101	RTMP_ADAPTER *pAd;
102	CHAR *print_name;	102	CHAR *print_name;
103	INT chip_id = (int) ent->driver_data;	103	INT chip_id = (int) ent->driver_data;
104	ULONG csr_addr;	104	unsigned long csr_addr;
105	CSR3_STRUC StaMacReg0;	105	CSR3_STRUC StaMacReg0;
106	CSR4_STRUC StaMacReg1;	106	CSR4_STRUC StaMacReg1;
107	INT Status;	107	INT Status;
Lines 128-134 Link Here
128	net_dev->irq = pPci_Dev->irq;	128	net_dev->irq = pPci_Dev->irq;
129		129
130	// map physical address to virtual address for accessing register	130	// map physical address to virtual address for accessing register
131	csr_addr = (ULONG) ioremap(pci_resource_start(pPci_Dev, 0), pci_resource_len(pPci_Dev, 0));	131	csr_addr = (unsigned long) ioremap(pci_resource_start(pPci_Dev, 0), pci_resource_len(pPci_Dev, 0));
132	if (!csr_addr)	132	if (!csr_addr)
133	{	133	{
134	DBGPRINT(RT_DEBUG_TRACE, "ioremap failed for device %s, region 0x%X @ 0x%lX\n",	134	DBGPRINT(RT_DEBUG_TRACE, "ioremap failed for device %s, region 0x%X @ 0x%lX\n",
Lines 139-145 Link Here
139	// Save CSR virtual address and irq to device structure	139	// Save CSR virtual address and irq to device structure
140	net_dev->base_addr = csr_addr;	140	net_dev->base_addr = csr_addr;
141	pAd = net_dev->priv;	141	pAd = net_dev->priv;
142	pAd->CSRBaseAddress = csr_addr;	142	pAd->CSRBaseAddress = net_dev->base_addr;
143	pAd->net_dev = net_dev;	143	pAd->net_dev = net_dev;
144		144
145	// Set DMA master	145	// Set DMA master