From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 17 Mar 2006 00:27:08 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: firefly_0821_release~37609^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream-fixes'
---

abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b
diff --cc drivers/net/e1000/e1000_main.c
index 4400117eb6c7,84dcca3776ee..f39de16e6b97
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@@ -3771,9 -3853,8 +3771,9 @@@ e1000_clean_rx_irq_ps(struct e1000_adap
  			skb->data_len += length;
  		}
  
 +copydone:
  		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 &
@@@ -3797,9 -3878,13 +3797,9 @@@
  		}
  #endif /* CONFIG_E1000_NAPI */
  		netdev->last_rx = jiffies;
 -#ifdef CONFIG_E1000_MQ
 -		rx_ring->rx_stats.packets++;
 -		rx_ring->rx_stats.bytes += length;
 -#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 */