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

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c

Small minor conflict in bnx2x, wherein one commit changed how
statistics were stored in software, and another commit
fixed endianness bugs wrt. reading the values provided by
the chip in memory.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/ethernet/3com/3c59x.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index abd310d,1adef26..14c961b
--- 1/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
--- 2/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@@ -980,43 -1006,97 +980,43 @@@ static int bnx2x_storm_stats_update(str
                                    total_transmitted_dropped_packets_error);
  
                /* TPA aggregations completed */
 -              UPDATE_EXTEND_USTAT(coalesced_events, total_tpa_aggregations);
 +              UPDATE_EXTEND_E_USTAT(coalesced_events, total_tpa_aggregations);
                /* Number of network frames aggregated by TPA */
 -              UPDATE_EXTEND_USTAT(coalesced_pkts,
 -                                  total_tpa_aggregated_frames);
 +              UPDATE_EXTEND_E_USTAT(coalesced_pkts,
 +                                    total_tpa_aggregated_frames);
                /* Total number of bytes in completed TPA aggregations */
 -              qstats->total_tpa_bytes_lo =
 -                      le32_to_cpu(uclient->coalesced_bytes.lo);
 -              qstats->total_tpa_bytes_hi =
 -                      le32_to_cpu(uclient->coalesced_bytes.hi);
 -
 -              /* TPA stats per-function */
 -              ADD_64(estats->total_tpa_aggregations_hi,
 -                     qstats->total_tpa_aggregations_hi,
 -                     estats->total_tpa_aggregations_lo,
 -                     qstats->total_tpa_aggregations_lo);
 -              ADD_64(estats->total_tpa_aggregated_frames_hi,
 -                     qstats->total_tpa_aggregated_frames_hi,
 -                     estats->total_tpa_aggregated_frames_lo,
 -                     qstats->total_tpa_aggregated_frames_lo);
 -              ADD_64(estats->total_tpa_bytes_hi,
 -                     qstats->total_tpa_bytes_hi,
 -                     estats->total_tpa_bytes_lo,
 -                     qstats->total_tpa_bytes_lo);
 -
 -              ADD_64(fstats->total_bytes_received_hi,
 -                     qstats->total_bytes_received_hi,
 -                     fstats->total_bytes_received_lo,
 -                     qstats->total_bytes_received_lo);
 -              ADD_64(fstats->total_bytes_transmitted_hi,
 -                     qstats->total_bytes_transmitted_hi,
 -                     fstats->total_bytes_transmitted_lo,
 -                     qstats->total_bytes_transmitted_lo);
 -              ADD_64(fstats->total_unicast_packets_received_hi,
 -                     qstats->total_unicast_packets_received_hi,
 -                     fstats->total_unicast_packets_received_lo,
 -                     qstats->total_unicast_packets_received_lo);
 -              ADD_64(fstats->total_multicast_packets_received_hi,
 -                     qstats->total_multicast_packets_received_hi,
 -                     fstats->total_multicast_packets_received_lo,
 -                     qstats->total_multicast_packets_received_lo);
 -              ADD_64(fstats->total_broadcast_packets_received_hi,
 -                     qstats->total_broadcast_packets_received_hi,
 -                     fstats->total_broadcast_packets_received_lo,
 -                     qstats->total_broadcast_packets_received_lo);
 -              ADD_64(fstats->total_unicast_packets_transmitted_hi,
 -                     qstats->total_unicast_packets_transmitted_hi,
 -                     fstats->total_unicast_packets_transmitted_lo,
 -                     qstats->total_unicast_packets_transmitted_lo);
 -              ADD_64(fstats->total_multicast_packets_transmitted_hi,
 -                     qstats->total_multicast_packets_transmitted_hi,
 -                     fstats->total_multicast_packets_transmitted_lo,
 -                     qstats->total_multicast_packets_transmitted_lo);
 -              ADD_64(fstats->total_broadcast_packets_transmitted_hi,
 -                     qstats->total_broadcast_packets_transmitted_hi,
 -                     fstats->total_broadcast_packets_transmitted_lo,
 -                     qstats->total_broadcast_packets_transmitted_lo);
 -              ADD_64(fstats->valid_bytes_received_hi,
 -                     qstats->valid_bytes_received_hi,
 -                     fstats->valid_bytes_received_lo,
 -                     qstats->valid_bytes_received_lo);
 -
 -              ADD_64(estats->etherstatsoverrsizepkts_hi,
 -                     qstats->etherstatsoverrsizepkts_hi,
 -                     estats->etherstatsoverrsizepkts_lo,
 -                     qstats->etherstatsoverrsizepkts_lo);
 -              ADD_64(estats->no_buff_discard_hi, qstats->no_buff_discard_hi,
 -                     estats->no_buff_discard_lo, qstats->no_buff_discard_lo);
 +              UPDATE_QSTAT(uclient->coalesced_bytes, total_tpa_bytes);
 +
 +              UPDATE_ESTAT_QSTAT_64(total_tpa_bytes);
 +
 +              UPDATE_FSTAT_QSTAT(total_bytes_received);
 +              UPDATE_FSTAT_QSTAT(total_bytes_transmitted);
 +              UPDATE_FSTAT_QSTAT(total_unicast_packets_received);
 +              UPDATE_FSTAT_QSTAT(total_multicast_packets_received);
 +              UPDATE_FSTAT_QSTAT(total_broadcast_packets_received);
 +              UPDATE_FSTAT_QSTAT(total_unicast_packets_transmitted);
 +              UPDATE_FSTAT_QSTAT(total_multicast_packets_transmitted);
 +              UPDATE_FSTAT_QSTAT(total_broadcast_packets_transmitted);
 +              UPDATE_FSTAT_QSTAT(valid_bytes_received);
        }
  
 -      ADD_64(fstats->total_bytes_received_hi,
 +      ADD_64(estats->total_bytes_received_hi,
               estats->rx_stat_ifhcinbadoctets_hi,
 -             fstats->total_bytes_received_lo,
 +             estats->total_bytes_received_lo,
               estats->rx_stat_ifhcinbadoctets_lo);
  
 -      ADD_64(fstats->total_bytes_received_hi,
 +      ADD_64(estats->total_bytes_received_hi,
-              tfunc->rcv_error_bytes.hi,
+              le32_to_cpu(tfunc->rcv_error_bytes.hi),
 -             fstats->total_bytes_received_lo,
 +             estats->total_bytes_received_lo,
-              tfunc->rcv_error_bytes.lo);
+              le32_to_cpu(tfunc->rcv_error_bytes.lo));
  
 -      memcpy(estats, &(fstats->total_bytes_received_hi),
 -             sizeof(struct host_func_stats) - 2*sizeof(u32));
 -
        ADD_64(estats->error_bytes_received_hi,
-              tfunc->rcv_error_bytes.hi,
+              le32_to_cpu(tfunc->rcv_error_bytes.hi),
               estats->error_bytes_received_lo,
-              tfunc->rcv_error_bytes.lo);
+              le32_to_cpu(tfunc->rcv_error_bytes.lo));
  
 -      ADD_64(estats->etherstatsoverrsizepkts_hi,
 -             estats->rx_stat_dot3statsframestoolong_hi,
 -             estats->etherstatsoverrsizepkts_lo,
 -             estats->rx_stat_dot3statsframestoolong_lo);
 +      UPDATE_ESTAT(etherstatsoverrsizepkts, rx_stat_dot3statsframestoolong);
 +
        ADD_64(estats->error_bytes_received_hi,
               estats->rx_stat_ifhcinbadoctets_hi,
               estats->error_bytes_received_lo,

diff --cc drivers/net/ethernet/freescale/fec.c
Simple merge

diff --cc drivers/net/ethernet/micrel/ks8851.c
Simple merge

diff --cc drivers/net/ethernet/micrel/ks8851_mll.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpmac.c
Simple merge

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

diff --cc drivers/net/wireless/rtlwifi/pci.c
index 5cb2199,9245d88..653fe72
--- 1/drivers/net/wireless/rtlwifi/pci.c
--- 2/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@@ -1860,10 -1870,20 +1860,10 @@@ int __devinit rtl_pci_probe(struct pci_
        }
  
        /* Init PCI sw */
-       err = !rtl_pci_init(hw, pdev);
+       err = rtl_pci_init(hw, pdev);
        if (err) {
 -              RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 -                       ("Failed to init PCI.\n"));
 -              goto fail3;
 -      }
 -
 -      err = ieee80211_register_hw(hw);
 -      if (err) {
 -              RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 -                       ("Can't register mac80211 hw.\n"));
 +              RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Failed to init PCI\n");
                goto fail3;
 -      } else {
 -              rtlpriv->mac80211.mac80211_registered = 1;
        }
  
        err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);

diff --cc net/core/netpoll.c
Simple merge

diff --cc net/mac80211/main.c
Simple merge