From: David S. Miller <davem@davemloft.net>
Date: Mon, 21 Nov 2011 18:50:33 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=efd0bf97deeddd9ba53daabfc470a1399c6b0b2d;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
---

efd0bf97deeddd9ba53daabfc470a1399c6b0b2d
diff --cc drivers/net/ethernet/marvell/sky2.c
index 7db6e36ec4f,7803efa46eb..ca33908bc7f
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@@ -1274,8 -1275,16 +1275,16 @@@ static void rx_set_checksum(struct sky2
  		     ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM);
  }
  
+ /*
+  * Fixed initial key as seed to RSS.
+  */
+ static const uint32_t rss_init_key[10] = {
+ 	0x7c3351da, 0x51c5cf4e,	0x44adbdd1, 0xe8d38d18,	0x48897c43,
+ 	0xb1d60e7e, 0x6a3dd760, 0x01a2e453, 0x16f46f13, 0x1a0e7b30
+ };
+ 
  /* Enable/disable receive hash calculation (RSS) */
 -static void rx_set_rss(struct net_device *dev, u32 features)
 +static void rx_set_rss(struct net_device *dev, netdev_features_t features)
  {
  	struct sky2_port *sky2 = netdev_priv(dev);
  	struct sky2_hw *hw = sky2->hw;
diff --cc drivers/net/ethernet/nvidia/forcedeth.c
index 49905347e0b,1c61d36e657..8db0b376d5b
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@@ -2532,10 -2443,8 +2532,10 @@@ static int nv_tx_done_optimized(struct 
  						nv_legacybackoff_reseed(dev);
  				}
  			} else {
- 					u64_stats_update_begin(&np->swstats_tx_syncp);
- 					np->stat_tx_packets++;
- 					np->stat_tx_bytes += np->get_tx_ctx->skb->len;
- 					u64_stats_update_end(&np->swstats_tx_syncp);
 -				dev->stats.tx_packets++;
 -				dev->stats.tx_bytes += np->get_tx_ctx->skb->len;
++				u64_stats_update_begin(&np->swstats_tx_syncp);
++				np->stat_tx_packets++;
++				np->stat_tx_bytes += np->get_tx_ctx->skb->len;
++				u64_stats_update_end(&np->swstats_tx_syncp);
  			}
  
  			dev_kfree_skb_any(np->get_tx_ctx->skb);
diff --cc drivers/net/wireless/libertas/cfg.c
index 89f34ad8d34,a7f1ab28940..d1d84e0e30f
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@@ -633,9 -632,9 +633,9 @@@ static int lbs_ret_scan(struct lbs_priv
  				     LBS_SCAN_RSSI_TO_MBM(rssi)/100);
  
  			if (channel &&
 -			    !(channel->flags & IEEE80211_CHAN_DISABLED))
 -				cfg80211_inform_bss(wiphy, channel,
 +			    !(channel->flags & IEEE80211_CHAN_DISABLED)) {
 +				bss = cfg80211_inform_bss(wiphy, channel,
- 					bssid, le64_to_cpu(*(__le64 *)tsfdesc),
+ 					bssid, get_unaligned_le64(tsfdesc),
  					capa, intvl, ie, ielen,
  					LBS_SCAN_RSSI_TO_MBM(rssi),
  					GFP_KERNEL);