tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

tlan: Fix pci memory unmapping

Fix pci unmapping problem introduced by commit id
8953f1282793882a5444924f7a273dc72a43d0a3 "tlan: Fix small (< 64 bytes)
datagram transmissions".

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Sakari Ailus and committed by
David S. Miller bb5f133d 2c413a64

+9 -4
unified split
+9 -4
drivers/net/tlan.c
··· 1433 if ( ! bbuf ) { 1434 struct sk_buff *skb = TLan_GetSKB(head_list); 1435 pci_unmap_single(priv->pciDev, head_list->buffer[0].address, 1436 - skb->len, PCI_DMA_TODEVICE); 1437 dev_kfree_skb_any(skb); 1438 head_list->buffer[8].address = 0; 1439 head_list->buffer[9].address = 0; ··· 2059 list = priv->txList + i; 2060 skb = TLan_GetSKB(list); 2061 if ( skb ) { 2062 - pci_unmap_single(priv->pciDev, 2063 - list->buffer[0].address, skb->len, 2064 - PCI_DMA_TODEVICE); 2065 dev_kfree_skb_any( skb ); 2066 list->buffer[8].address = 0; 2067 list->buffer[9].address = 0;
··· 1433 if ( ! bbuf ) { 1434 struct sk_buff *skb = TLan_GetSKB(head_list); 1435 pci_unmap_single(priv->pciDev, head_list->buffer[0].address, 1436 + max(skb->len, 1437 + (unsigned int)TLAN_MIN_FRAME_SIZE), 1438 + PCI_DMA_TODEVICE); 1439 dev_kfree_skb_any(skb); 1440 head_list->buffer[8].address = 0; 1441 head_list->buffer[9].address = 0; ··· 2057 list = priv->txList + i; 2058 skb = TLan_GetSKB(list); 2059 if ( skb ) { 2060 + pci_unmap_single( 2061 + priv->pciDev, 2062 + list->buffer[0].address, 2063 + max(skb->len, 2064 + (unsigned int)TLAN_MIN_FRAME_SIZE), 2065 + PCI_DMA_TODEVICE); 2066 dev_kfree_skb_any( skb ); 2067 list->buffer[8].address = 0; 2068 list->buffer[9].address = 0;