Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3d7a3a4 authored by David S. Miller's avatar David S. Miller Committed by Jeff Garzik
Browse files

[PATCH] e1000 endianness bugs 



	return -E_NO_BIG_ENDIAN_TESTING;

[E1000]: Fix 4 missed endianness conversions on RX descriptor fields.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b27a1ed5

drivers/net/e1000/e1000_main.c

+4 −4
Original line number Diff line number Diff line
@@ -3710,7 +3710,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter, 
		e1000_rx_checksum(adapter,

				  (uint32_t)(status) |

				  ((uint32_t)(rx_desc->errors) << 24),

				  rx_desc->csum, skb);

				  le16_to_cpu(rx_desc->csum), skb);



		skb->protocol = eth_type_trans(skb, netdev);

#ifdef CONFIG_E1000_NAPI
@@ -3854,11 +3854,11 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, 
		}



		e1000_rx_checksum(adapter, staterr,

				  rx_desc->wb.lower.hi_dword.csum_ip.csum, skb);

				  le16_to_cpu(rx_desc->wb.lower.hi_dword.csum_ip.csum), skb);

		skb->protocol = eth_type_trans(skb, netdev);



		if (likely(rx_desc->wb.upper.header_status &

			  E1000_RXDPS_HDRSTAT_HDRSP))

			   cpu_to_le16(E1000_RXDPS_HDRSTAT_HDRSP)))

			adapter->rx_hdr_split++;

#ifdef CONFIG_E1000_NAPI

		if (unlikely(adapter->vlgrp && (staterr & E1000_RXD_STAT_VP))) {
@@ -3884,7 +3884,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, 
#endif



next_desc:

		rx_desc->wb.middle.status_error &= ~0xFF;

		rx_desc->wb.middle.status_error &= cpu_to_le32(~0xFF);

		buffer_info->skb = NULL;



		/* return some buffers to hardware, one at a time is too slow */