ipg: endianness fixes
PATCH 1/1 ipg: endianness fixes
if your mask is host-endian, you should apply it after le64_to_cpu(); if it's little-endian - before. Doing both (for the same mask and little-endian value) is broken.
Signed-off-by Al Viro <[email protected]>
--- drivers/net/ipg.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-)
drivers/net/ipg.c +17 -17
@@ -754,7 +754,7 @@ static int init_rfdlist(struct net_device *dev)if (sp->RxBuff[i]) {pci_unmap_single (sp->pdev, -le64_to_cpu (rxfd->frag_info & ~IPG_RFI_FRAGLEN ), +le64_to_cpu (rxfd->frag_info) & ~IPG_RFI_FRAGLEN , sp->rx_buf_sz,PCI_DMA_FROMDEVICE );IPG_DEV_KFREE_SKB (sp->RxBuff[i]); sp->RxBuff[i] =NULL ;
@@ -871,7 +871,7 @@ static void ipg_nic_txfree(struct net_device *dev)/* Free the transmit buffer. */ if (skb) {pci_unmap_single (sp->pdev, -le64_to_cpu (txfd->frag_info & ~IPG_TFI_FRAGLEN ), +le64_to_cpu (txfd->frag_info) & ~IPG_TFI_FRAGLEN , skb->len,PCI_DMA_TODEVICE );IPG_DEV_KFREE_SKB (skb);
@@ -1413,10 +1413,10 @@ static int ipg_nic_rx(struct net_device *dev) framelen =IPG_RXFRAG_SIZE ; } -if ((IPG_DROP_ON_RX_ETH_ERRORS && (le64_to_cpu (rxfd->rfs & +if ((IPG_DROP_ON_RX_ETH_ERRORS && (le64_to_cpu (rxfd->rfs) & (IPG_RFS_RXFIFOOVERRUN |IPG_RFS_RXRUNTFRAME |IPG_RFS_RXALIGNMENTERROR |IPG_RFS_RXFCSERROR | -IPG_RFS_RXOVERSIZEDFRAME |IPG_RFS_RXLENGTHERROR ))))) { +IPG_RFS_RXOVERSIZEDFRAME |IPG_RFS_RXLENGTHERROR )))) {IPG_DEBUG_MSG ("Rx error, RFS = %16.16lx\n" , (unsigned long int ) rxfd->rfs);
@@ -1425,27 +1425,27 @@ static int ipg_nic_rx(struct net_device *dev) sp->stats.rx_errors++;/* Increment detailed receive error statistics. */ -if (le64_to_cpu (rxfd->rfs &IPG_RFS_RXFIFOOVERRUN )) { +if (le64_to_cpu (rxfd->rfs) &IPG_RFS_RXFIFOOVERRUN ) {IPG_DEBUG_MSG ("RX FIFO overrun occured.\n" ); sp->stats.rx_fifo_errors++; } -if (le64_to_cpu (rxfd->rfs &IPG_RFS_RXRUNTFRAME )) { +if (le64_to_cpu (rxfd->rfs) &IPG_RFS_RXRUNTFRAME ) {IPG_DEBUG_MSG ("RX runt occured.\n" ); sp->stats.rx_length_errors++; } -if (le64_to_cpu (rxfd->rfs &IPG_RFS_RXOVERSIZEDFRAME )) ; +if (le64_to_cpu (rxfd->rfs) &IPG_RFS_RXOVERSIZEDFRAME ) ;/* Do nothing, error count handled by a IPG * statistic register. */ -if (le64_to_cpu (rxfd->rfs &IPG_RFS_RXALIGNMENTERROR )) { +if (le64_to_cpu (rxfd->rfs) &IPG_RFS_RXALIGNMENTERROR ) {IPG_DEBUG_MSG ("RX alignment error occured.\n" ); sp->stats.rx_frame_errors++; } -if (le64_to_cpu (rxfd->rfs &IPG_RFS_RXFCSERROR )) ; +if (le64_to_cpu (rxfd->rfs) &IPG_RFS_RXFCSERROR ) ;/* Do nothing, error count handled by a IPG * statistic register. */
@@ -1455,10 +1455,10 @@ static int ipg_nic_rx(struct net_device *dev)* not pass it to higher layer processes. */ if (skb) { -u64 info = rxfd->frag_info; +__le64 info = rxfd->frag_info;pci_unmap_single (sp->pdev, -le64_to_cpu (info & ~IPG_RFI_FRAGLEN ), +le64_to_cpu (info) & ~IPG_RFI_FRAGLEN , sp->rx_buf_sz,PCI_DMA_FROMDEVICE );IPG_DEV_KFREE_SKB (skb);
@@ -1532,9 +1532,9 @@ static int ipg_nic_rx(struct net_device *dev)if (!i) sp->EmptyRFDListCount++;#endif -while ((le64_to_cpu (rxfd->rfs &IPG_RFS_RFDDONE )) && - !((le64_to_cpu (rxfd->rfs &IPG_RFS_FRAMESTART )) && - (le64_to_cpu (rxfd->rfs &IPG_RFS_FRAMEEND )))) { +while ((le64_to_cpu (rxfd->rfs) &IPG_RFS_RFDDONE ) && + !((le64_to_cpu (rxfd->rfs) &IPG_RFS_FRAMESTART ) && + (le64_to_cpu (rxfd->rfs) &IPG_RFS_FRAMEEND ))) {unsigned int entry = curr++ %IPG_RFDLIST_LENGTH ; rxfd = sp->rxd + entry;
@@ -1552,7 +1552,7 @@ static int ipg_nic_rx(struct net_device *dev)*/ if (sp->RxBuff[entry]) {pci_unmap_single (sp->pdev, -le64_to_cpu (rxfd->frag_info & ~IPG_RFI_FRAGLEN ), +le64_to_cpu (rxfd->frag_info) & ~IPG_RFI_FRAGLEN , sp->rx_buf_sz,PCI_DMA_FROMDEVICE );IPG_DEV_KFREE_SKB (sp->RxBuff[entry]); }
@@ -1730,7 +1730,7 @@ static void ipg_rx_clear(struct ipg_nic_private *sp)IPG_DEV_KFREE_SKB (sp->RxBuff[i]); sp->RxBuff[i] =NULL ;pci_unmap_single (sp->pdev, -le64_to_cpu (rxfd->frag_info & ~IPG_RFI_FRAGLEN ), +le64_to_cpu (rxfd->frag_info) & ~IPG_RFI_FRAGLEN , sp->rx_buf_sz,PCI_DMA_FROMDEVICE ); } }
@@ -1745,7 +1745,7 @@ static void ipg_tx_clear(struct ipg_nic_private *sp)struct ipg_tx *txfd = sp->txd + i;pci_unmap_single (sp->pdev, -le64_to_cpu (txfd->frag_info & ~IPG_TFI_FRAGLEN ), +le64_to_cpu (txfd->frag_info) & ~IPG_TFI_FRAGLEN , sp->TxBuff[i]->len,PCI_DMA_TODEVICE );IPG_DEV_KFREE_SKB (sp->TxBuff[i]);
Signature · 1 line
1.5.3.GIT