diff options
-rw-r--r-- | drivers/net/ipg.c | 28 | ||||
-rw-r--r-- | drivers/net/ipg.h | 2 |
2 files changed, 14 insertions, 16 deletions
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c index 50f0c17451b1..780882f0910d 100644 --- a/drivers/net/ipg.c +++ b/drivers/net/ipg.c | |||
@@ -776,7 +776,7 @@ static int init_rfdlist(struct net_device *dev) | |||
776 | pci_unmap_single(sp->pdev, | 776 | pci_unmap_single(sp->pdev, |
777 | le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN, | 777 | le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN, |
778 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); | 778 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); |
779 | IPG_DEV_KFREE_SKB(sp->RxBuff[i]); | 779 | dev_kfree_skb_irq(sp->RxBuff[i]); |
780 | sp->RxBuff[i] = NULL; | 780 | sp->RxBuff[i] = NULL; |
781 | } | 781 | } |
782 | 782 | ||
@@ -829,7 +829,7 @@ static void init_tfdlist(struct net_device *dev) | |||
829 | txfd->tfc = cpu_to_le64(IPG_TFC_TFDDONE); | 829 | txfd->tfc = cpu_to_le64(IPG_TFC_TFDDONE); |
830 | 830 | ||
831 | if (sp->TxBuff[i]) { | 831 | if (sp->TxBuff[i]) { |
832 | IPG_DEV_KFREE_SKB(sp->TxBuff[i]); | 832 | dev_kfree_skb_irq(sp->TxBuff[i]); |
833 | sp->TxBuff[i] = NULL; | 833 | sp->TxBuff[i] = NULL; |
834 | } | 834 | } |
835 | 835 | ||
@@ -884,7 +884,7 @@ static void ipg_nic_txfree(struct net_device *dev) | |||
884 | le64_to_cpu(txfd->frag_info) & ~IPG_TFI_FRAGLEN, | 884 | le64_to_cpu(txfd->frag_info) & ~IPG_TFI_FRAGLEN, |
885 | skb->len, PCI_DMA_TODEVICE); | 885 | skb->len, PCI_DMA_TODEVICE); |
886 | 886 | ||
887 | IPG_DEV_KFREE_SKB(skb); | 887 | dev_kfree_skb_irq(skb); |
888 | 888 | ||
889 | sp->TxBuff[dirty] = NULL; | 889 | sp->TxBuff[dirty] = NULL; |
890 | } | 890 | } |
@@ -1112,7 +1112,7 @@ inline void ipg_nic_rx_free_skb(struct net_device *dev) | |||
1112 | pci_unmap_single(sp->pdev, | 1112 | pci_unmap_single(sp->pdev, |
1113 | le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN), | 1113 | le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN), |
1114 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); | 1114 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); |
1115 | IPG_DEV_KFREE_SKB(sp->RxBuff[entry]); | 1115 | dev_kfree_skb_irq(sp->RxBuff[entry]); |
1116 | sp->RxBuff[entry] = NULL; | 1116 | sp->RxBuff[entry] = NULL; |
1117 | } | 1117 | } |
1118 | } | 1118 | } |
@@ -1180,7 +1180,7 @@ inline int ipg_nic_rx_check_error(struct net_device *dev) | |||
1180 | le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN), | 1180 | le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN), |
1181 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); | 1181 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); |
1182 | 1182 | ||
1183 | IPG_DEV_KFREE_SKB(sp->RxBuff[entry]); | 1183 | dev_kfree_skb_irq(sp->RxBuff[entry]); |
1184 | sp->RxBuff[entry] = NULL; | 1184 | sp->RxBuff[entry] = NULL; |
1185 | } | 1185 | } |
1186 | return ErrorPacket; | 1186 | return ErrorPacket; |
@@ -1197,7 +1197,7 @@ static void ipg_nic_rx_with_start_and_end(struct net_device *dev, | |||
1197 | int framelen; | 1197 | int framelen; |
1198 | 1198 | ||
1199 | if (jumbo->FoundStart) { | 1199 | if (jumbo->FoundStart) { |
1200 | IPG_DEV_KFREE_SKB(jumbo->skb); | 1200 | dev_kfree_skb_irq(jumbo->skb); |
1201 | jumbo->FoundStart = 0; | 1201 | jumbo->FoundStart = 0; |
1202 | jumbo->CurrentSize = 0; | 1202 | jumbo->CurrentSize = 0; |
1203 | jumbo->skb = NULL; | 1203 | jumbo->skb = NULL; |
@@ -1242,7 +1242,7 @@ static void ipg_nic_rx_with_start(struct net_device *dev, | |||
1242 | return; | 1242 | return; |
1243 | 1243 | ||
1244 | if (jumbo->FoundStart) | 1244 | if (jumbo->FoundStart) |
1245 | IPG_DEV_KFREE_SKB(jumbo->skb); | 1245 | dev_kfree_skb_irq(jumbo->skb); |
1246 | 1246 | ||
1247 | pci_unmap_single(pdev, le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN), | 1247 | pci_unmap_single(pdev, le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN), |
1248 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); | 1248 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); |
@@ -1281,7 +1281,7 @@ static void ipg_nic_rx_with_end(struct net_device *dev, | |||
1281 | framelen=IPG_RXFRAG_SIZE; | 1281 | framelen=IPG_RXFRAG_SIZE; |
1282 | */ | 1282 | */ |
1283 | if (framelen > IPG_RXSUPPORT_SIZE) | 1283 | if (framelen > IPG_RXSUPPORT_SIZE) |
1284 | IPG_DEV_KFREE_SKB(jumbo->skb); | 1284 | dev_kfree_skb_irq(jumbo->skb); |
1285 | else { | 1285 | else { |
1286 | memcpy(skb_put(jumbo->skb, endframeLen), | 1286 | memcpy(skb_put(jumbo->skb, endframeLen), |
1287 | skb->data, endframeLen); | 1287 | skb->data, endframeLen); |
@@ -1301,7 +1301,7 @@ static void ipg_nic_rx_with_end(struct net_device *dev, | |||
1301 | 1301 | ||
1302 | ipg_nic_rx_free_skb(dev); | 1302 | ipg_nic_rx_free_skb(dev); |
1303 | } else { | 1303 | } else { |
1304 | IPG_DEV_KFREE_SKB(jumbo->skb); | 1304 | dev_kfree_skb_irq(jumbo->skb); |
1305 | jumbo->FoundStart = 0; | 1305 | jumbo->FoundStart = 0; |
1306 | jumbo->CurrentSize = 0; | 1306 | jumbo->CurrentSize = 0; |
1307 | jumbo->skb = NULL; | 1307 | jumbo->skb = NULL; |
@@ -1331,7 +1331,7 @@ static void ipg_nic_rx_no_start_no_end(struct net_device *dev, | |||
1331 | ipg_nic_rx_free_skb(dev); | 1331 | ipg_nic_rx_free_skb(dev); |
1332 | } | 1332 | } |
1333 | } else { | 1333 | } else { |
1334 | IPG_DEV_KFREE_SKB(jumbo->skb); | 1334 | dev_kfree_skb_irq(jumbo->skb); |
1335 | jumbo->FoundStart = 0; | 1335 | jumbo->FoundStart = 0; |
1336 | jumbo->CurrentSize = 0; | 1336 | jumbo->CurrentSize = 0; |
1337 | jumbo->skb = NULL; | 1337 | jumbo->skb = NULL; |
@@ -1472,7 +1472,7 @@ static int ipg_nic_rx(struct net_device *dev) | |||
1472 | le64_to_cpu(info) & ~IPG_RFI_FRAGLEN, | 1472 | le64_to_cpu(info) & ~IPG_RFI_FRAGLEN, |
1473 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); | 1473 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); |
1474 | 1474 | ||
1475 | IPG_DEV_KFREE_SKB(skb); | 1475 | dev_kfree_skb_irq(skb); |
1476 | } | 1476 | } |
1477 | } else { | 1477 | } else { |
1478 | 1478 | ||
@@ -1565,7 +1565,7 @@ static int ipg_nic_rx(struct net_device *dev) | |||
1565 | pci_unmap_single(sp->pdev, | 1565 | pci_unmap_single(sp->pdev, |
1566 | le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN, | 1566 | le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN, |
1567 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); | 1567 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); |
1568 | IPG_DEV_KFREE_SKB(sp->RxBuff[entry]); | 1568 | dev_kfree_skb_irq(sp->RxBuff[entry]); |
1569 | } | 1569 | } |
1570 | 1570 | ||
1571 | /* Assure RX buffer is not reused by IPG. */ | 1571 | /* Assure RX buffer is not reused by IPG. */ |
@@ -1738,7 +1738,7 @@ static void ipg_rx_clear(struct ipg_nic_private *sp) | |||
1738 | if (sp->RxBuff[i]) { | 1738 | if (sp->RxBuff[i]) { |
1739 | struct ipg_rx *rxfd = sp->rxd + i; | 1739 | struct ipg_rx *rxfd = sp->rxd + i; |
1740 | 1740 | ||
1741 | IPG_DEV_KFREE_SKB(sp->RxBuff[i]); | 1741 | dev_kfree_skb_irq(sp->RxBuff[i]); |
1742 | sp->RxBuff[i] = NULL; | 1742 | sp->RxBuff[i] = NULL; |
1743 | pci_unmap_single(sp->pdev, | 1743 | pci_unmap_single(sp->pdev, |
1744 | le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN, | 1744 | le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN, |
@@ -1759,7 +1759,7 @@ static void ipg_tx_clear(struct ipg_nic_private *sp) | |||
1759 | le64_to_cpu(txfd->frag_info) & ~IPG_TFI_FRAGLEN, | 1759 | le64_to_cpu(txfd->frag_info) & ~IPG_TFI_FRAGLEN, |
1760 | sp->TxBuff[i]->len, PCI_DMA_TODEVICE); | 1760 | sp->TxBuff[i]->len, PCI_DMA_TODEVICE); |
1761 | 1761 | ||
1762 | IPG_DEV_KFREE_SKB(sp->TxBuff[i]); | 1762 | dev_kfree_skb_irq(sp->TxBuff[i]); |
1763 | 1763 | ||
1764 | sp->TxBuff[i] = NULL; | 1764 | sp->TxBuff[i] = NULL; |
1765 | } | 1765 | } |
diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h index 017727f7d7b0..9633b702fb5b 100644 --- a/drivers/net/ipg.h +++ b/drivers/net/ipg.h | |||
@@ -27,8 +27,6 @@ | |||
27 | 27 | ||
28 | #define DrvVer "2.09d" | 28 | #define DrvVer "2.09d" |
29 | 29 | ||
30 | #define IPG_DEV_KFREE_SKB(skb) dev_kfree_skb_irq(skb) | ||
31 | |||
32 | /* | 30 | /* |
33 | * Constants | 31 | * Constants |
34 | */ | 32 | */ |