lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tlan: Fix two regressions introduced by 64bit conversion.

Browse Source 
Two regressions were introduced by the recent tlan: 64bit conversion
commit (93e16847c9).  The first in
TLan_GetSKB caused a NULL pointer dereference.  With the second causing
the link to fail to come up.

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Robert Fitzsimons
2008-08-09 17:54:02 +01:00
committed by Jeff Garzik
parent e484d5f5c8
commit 0d63bea2c2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/tlan.c
View File

@@ -360,8 +360,8 @@ TLan_GetSKB( const struct tlan_list_tag *tag)
{ {
unsigned long addr; unsigned long addr;
addr = tag->buffer[8].address; addr = tag->buffer[9].address;
addr |= (tag->buffer[9].address << 16) << 16; addr |= (tag->buffer[8].address << 16) << 16;
return (struct sk_buff *) addr; return (struct sk_buff *) addr;
} }
@@ -1984,7 +1984,6 @@ static void TLan_ResetLists( struct net_device *dev )
TLanList *list; TLanList *list;
dma_addr_t list_phys; dma_addr_t list_phys;
struct sk_buff *skb; struct sk_buff *skb;
void *t = NULL;
priv->txHead = 0; priv->txHead = 0;
priv->txTail = 0; priv->txTail = 0;
@@ -2022,7 +2021,8 @@ static void TLan_ResetLists( struct net_device *dev )
} }
skb_reserve( skb, NET_IP_ALIGN ); skb_reserve( skb, NET_IP_ALIGN );
list->buffer[0].address = pci_map_single(priv->pciDev, t, list->buffer[0].address = pci_map_single(priv->pciDev,
skb->data,
TLAN_MAX_FRAME_SIZE, TLAN_MAX_FRAME_SIZE,
PCI_DMA_FROMDEVICE); PCI_DMA_FROMDEVICE);
TLan_StoreSKB(list, skb); TLan_StoreSKB(list, skb);