Merge branch 'upstream-fixes'

diff --cc drivers/net/e100.c
Simple merge

diff --cc drivers/net/e1000/e1000_main.c
index 4400117eb6c7986f58a2bdc7319d7c90fded9658,84dcca3776eeeed78658b264ed2302c9daedef38..f39de16e6b9730769ab00cd759ba78c8fe6e86b5
--- 1/drivers/net/e1000/e1000_main.c
--- 2/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 */

diff --cc drivers/net/tg3.c
Simple merge

diff --cc net/ieee80211/ieee80211_crypt_ccmp.c
Simple merge

diff --cc net/ieee80211/ieee80211_rx.c
Simple merge