Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Mon, 21 Nov 2011 18:50:33 +0000 (13:50 -0500)]
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

17 files changed:
1  2 
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/marvell/sky2.c
drivers/net/ethernet/nvidia/forcedeth.c
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/xilinx/ll_temac_main.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/mwifiex/scan.c
drivers/s390/net/qeth_l3_main.c
drivers/virtio/virtio_pci.c
net/ipv6/ip6_tunnel.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/util.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -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;
@@@ -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);
@@@ -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);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge