Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
net: ipg.c fix bracing on endian swapping
rxfd->frag_info is a __le64, IPG_RFI_FRAGLEN is a cpu-endian
constant and wants to be outside of the le64_to_cpu. Fixed
in multiple places.
Also an occurrence where le64_to_cpu was used instead of cpu_to_le64
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by Harvey Harrison and committed by David S. Miller b88ed5cc de339c2a
+4
-4
drivers/net/ipg.c
+4
-4
drivers/net/ipg.c
···
1112
struct ipg_rx *rxfd = sp->rxd + entry;
1113
1114
pci_unmap_single(sp->pdev,
1115
-
le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN),
1116
sp->rx_buf_sz, PCI_DMA_FROMDEVICE);
1117
dev_kfree_skb_irq(sp->rx_buff[entry]);
1118
sp->rx_buff[entry] = NULL;
···
1179
*/
1180
if (sp->rx_buff[entry]) {
1181
pci_unmap_single(sp->pdev,
1182
-
le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN),
1183
sp->rx_buf_sz, PCI_DMA_FROMDEVICE);
1184
1185
dev_kfree_skb_irq(sp->rx_buff[entry]);
···
1246
if (jumbo->found_start)
1247
dev_kfree_skb_irq(jumbo->skb);
1248
1249
-
pci_unmap_single(pdev, le64_to_cpu(rxfd->frag_info & ~IPG_RFI_FRAGLEN),
1250
sp->rx_buf_sz, PCI_DMA_FROMDEVICE);
1251
1252
skb_put(skb, sp->rxfrag_size);
···
1349
unsigned int entry = curr % IPG_RFDLIST_LENGTH;
1350
struct ipg_rx *rxfd = sp->rxd + entry;
1351
1352
-
if (!(rxfd->rfs & le64_to_cpu(IPG_RFS_RFDDONE)))
1353
break;
1354
1355
switch (ipg_nic_rx_check_frame_type(dev)) {
···
1112
struct ipg_rx *rxfd = sp->rxd + entry;
1113
1114
pci_unmap_single(sp->pdev,
1115
+
le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN,
1116
sp->rx_buf_sz, PCI_DMA_FROMDEVICE);
1117
dev_kfree_skb_irq(sp->rx_buff[entry]);
1118
sp->rx_buff[entry] = NULL;
···
1179
*/
1180
if (sp->rx_buff[entry]) {
1181
pci_unmap_single(sp->pdev,
1182
+
le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN,
1183
sp->rx_buf_sz, PCI_DMA_FROMDEVICE);
1184
1185
dev_kfree_skb_irq(sp->rx_buff[entry]);
···
1246
if (jumbo->found_start)
1247
dev_kfree_skb_irq(jumbo->skb);
1248
1249
+
pci_unmap_single(pdev, le64_to_cpu(rxfd->frag_info) & ~IPG_RFI_FRAGLEN,
1250
sp->rx_buf_sz, PCI_DMA_FROMDEVICE);
1251
1252
skb_put(skb, sp->rxfrag_size);
···
1349
unsigned int entry = curr % IPG_RFDLIST_LENGTH;
1350
struct ipg_rx *rxfd = sp->rxd + entry;
1351
1352
+
if (!(rxfd->rfs & cpu_to_le64(IPG_RFS_RFDDONE)))
1353
break;
1354
1355
switch (ipg_nic_rx_check_frame_type(dev)) {