diff options
Diffstat (limited to 'drivers/net/ipg.c')
-rw-r--r-- | drivers/net/ipg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c index 24c777aff5c6..7b6d435a8468 100644 --- a/drivers/net/ipg.c +++ b/drivers/net/ipg.c | |||
@@ -1112,7 +1112,7 @@ static void ipg_nic_rx_free_skb(struct net_device *dev) | |||
1112 | struct ipg_rx *rxfd = sp->rxd + entry; | 1112 | struct ipg_rx *rxfd = sp->rxd + entry; |
1113 | 1113 | ||
1114 | pci_unmap_single(sp->pdev, | 1114 | pci_unmap_single(sp->pdev, |
1115 | le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN), | 1115 | le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN, |
1116 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); | 1116 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); |
1117 | dev_kfree_skb_irq(sp->rx_buff[entry]); | 1117 | dev_kfree_skb_irq(sp->rx_buff[entry]); |
1118 | sp->rx_buff[entry] = NULL; | 1118 | sp->rx_buff[entry] = NULL; |
@@ -1179,7 +1179,7 @@ static int ipg_nic_rx_check_error(struct net_device *dev) | |||
1179 | */ | 1179 | */ |
1180 | if (sp->rx_buff[entry]) { | 1180 | if (sp->rx_buff[entry]) { |
1181 | pci_unmap_single(sp->pdev, | 1181 | pci_unmap_single(sp->pdev, |
1182 | le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN), | 1182 | le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN, |
1183 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); | 1183 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); |
1184 | 1184 | ||
1185 | dev_kfree_skb_irq(sp->rx_buff[entry]); | 1185 | dev_kfree_skb_irq(sp->rx_buff[entry]); |
@@ -1245,7 +1245,7 @@ static void ipg_nic_rx_with_start(struct net_device *dev, | |||
1245 | if (jumbo->found_start) | 1245 | if (jumbo->found_start) |
1246 | dev_kfree_skb_irq(jumbo->skb); | 1246 | dev_kfree_skb_irq(jumbo->skb); |
1247 | 1247 | ||
1248 | pci_unmap_single(pdev, le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN), | 1248 | pci_unmap_single(pdev, le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN, |
1249 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); | 1249 | sp->rx_buf_sz, PCI_DMA_FROMDEVICE); |
1250 | 1250 | ||
1251 | skb_put(skb, sp->rxfrag_size); | 1251 | skb_put(skb, sp->rxfrag_size); |
@@ -1345,7 +1345,7 @@ static int ipg_nic_rx_jumbo(struct net_device *dev) | |||
1345 | unsigned int entry = curr % IPG_RFDLIST_LENGTH; | 1345 | unsigned int entry = curr % IPG_RFDLIST_LENGTH; |
1346 | struct ipg_rx *rxfd = sp->rxd + entry; | 1346 | struct ipg_rx *rxfd = sp->rxd + entry; |
1347 | 1347 | ||
1348 | if (!(rxfd->rfs & le64_to_cpu(IPG_RFS_RFDDONE))) | 1348 | if (!(rxfd->rfs & cpu_to_le64(IPG_RFS_RFDDONE))) |
1349 | break; | 1349 | break; |
1350 | 1350 | ||
1351 | switch (ipg_nic_rx_check_frame_type(dev)) { | 1351 | switch (ipg_nic_rx_check_frame_type(dev)) { |