Merge remote-tracking branch 'net/master'

Conflicts:
	MAINTAINERS
	arch/powerpc/configs/40x/hcu4_defconfig
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/s390/cio/qdio_main.c

diff --cc Documentation/networking/ip-sysctl.txt
Simple merge

diff --cc MAINTAINERS
index 1cc7e63e155886ebedf917dd8d95929a1932542d,579713ef7cfb4e750944c584a599fc3874bf0b42..d0f65318425584f5ba93bfeb9b941ab688c00a2b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1573,9 -1574,10 +1573,9 @@@ F:     drivers/scsi/bfa
  
  BROCADE BNA 10 GIGABIT ETHERNET DRIVER
  M:    Rasesh Mody <rmody@brocade.com>
 -M:    Debashis Dutt <ddutt@brocade.com>
  L:    netdev@vger.kernel.org
  S:    Supported
- F:    drivers/net/bna/
+ F:    drivers/net/ethernet/brocade/bna/
  
  BSG (block layer generic sg v4 driver)
  M:    FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/configs/ppc40x_defconfig
Simple merge

diff --cc arch/powerpc/platforms/40x/Kconfig
Simple merge

diff --cc arch/s390/include/asm/qdio.h
Simple merge

diff --cc drivers/bcma/main.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

diff --cc drivers/net/cris/eth_v10.c
Simple merge

diff --cc drivers/net/ethernet/amd/am79c961a.c
Simple merge

diff --cc drivers/net/ethernet/amd/au1000_eth.c
Simple merge

diff --cc drivers/net/ethernet/amd/au1000_eth.h
Simple merge

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

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

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

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index ba15bdc5a1a9fbb6c860acf6d6a272e07382d3b7,8e9b87be3002b0e06c596d848b2107fce2734528..818723c9e6783aa97b6e2340cd84c7ab44578cfa
--- 1/drivers/net/bnx2x/bnx2x_link.c
--- 2/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@@ -852,20 -852,26 +852,20 @@@ static int bnx2x_ets_e3b0_get_total_bw
        /* Calculate total BW requested */
        for (cos_idx = 0; cos_idx < ets_params->num_of_cos; cos_idx++) {
                if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state) {
 -
 -                      if (0 == ets_params->cos[cos_idx].params.bw_params.bw) {
 -                              DP(NETIF_MSG_LINK,
 -                                 "bnx2x_ets_E3B0_config BW was set to 0\n");
 -                      return -EINVAL;
 +                      *total_bw +=
 +                              ets_params->cos[cos_idx].params.bw_params.bw;
                }
 -              *total_bw +=
 -                  ets_params->cos[cos_idx].params.bw_params.bw;
 -          }
        }
  
 -      /*Check taotl BW is valid */
 +      /* Check total BW is valid */
        if ((100 != *total_bw) || (0 == *total_bw)) {
                if (0 == *total_bw) {
-                       DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config toatl BW"
-                                          "shouldn't be 0\n");
+                       DP(NETIF_MSG_LINK,
+                          "bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n");
                        return -EINVAL;
                }
-               DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config toatl BW should be"
-                                  "100\n");
+               DP(NETIF_MSG_LINK,
+                  "bnx2x_ets_E3B0_config toatl BW should be 100\n");
                /**
                *   We can handle a case whre the BW isn't 100 this can happen
                *   if the TC are joined.

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

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
Simple merge

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

diff --cc drivers/net/ethernet/cadence/at91_ether.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmveth.c
index 8dd5fccef7252933429d474418fdd712d841dac7,8cca4a62b397ca0d0a6d3eeabaea577b9862e206..72b84de48756083be896d9fea6228d28a8a6946c
--- 1/drivers/net/ibmveth.c
--- 2/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@@ -1014,11 -999,11 +1014,10 @@@ retry_bounce
  
        /* Map the frags */
        for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
 -              unsigned long dma_addr;
                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
  
-               dma_addr = dma_map_page(&adapter->vdev->dev, frag->page,
-                                       frag->page_offset, frag->size,
-                                       DMA_TO_DEVICE);
+               dma_addr = skb_frag_dma_map(&adapter->vdev->dev, frag, 0,
+                                           frag->size, DMA_TO_DEVICE);
  
                if (dma_mapping_error(&adapter->vdev->dev, dma_addr))
                        goto map_failed_frags;

diff --cc drivers/net/ethernet/intel/e1000/e1000_hw.c
Simple merge

diff --cc drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h
Simple merge

diff --cc drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

diff --cc drivers/net/ethernet/sfc/efx.c
Simple merge

diff --cc drivers/net/ethernet/sfc/io.h
Simple merge

diff --cc drivers/net/ethernet/sfc/mcdi.c
Simple merge

diff --cc drivers/net/ethernet/sfc/nic.c
Simple merge

diff --cc drivers/net/ethernet/sfc/nic.h
Simple merge

diff --cc drivers/net/ethernet/sfc/siena.c
Simple merge

diff --cc drivers/net/ethernet/sfc/workarounds.h
Simple merge

diff --cc drivers/net/ethernet/sun/cassini.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9003_phy.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/ath/carl9170/main.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/iwl-3945-rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-pci.c
index 2fdbffa079c1fdc4aa0529d5c2b0a885c8a18870,e41f53e5c307e702924fb23b349e4d4bf9de5073..1e69f485bc910361fdcce208e3a3187af5af8f5c
--- 1/drivers/net/wireless/iwlwifi/iwl-pci.c
--- 2/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@@ -478,25 -483,30 +483,25 @@@ out_no_pci
        return err;
  }
  
 -static void iwl_pci_down(struct iwl_bus *bus)
 -{
 -      struct iwl_pci_bus *pci_bus = (struct iwl_pci_bus *) bus->bus_specific;
 -
 -      pci_disable_msi(pci_bus->pci_dev);
 -      pci_iounmap(pci_bus->pci_dev, pci_bus->hw_base);
 -      pci_release_regions(pci_bus->pci_dev);
 -      pci_disable_device(pci_bus->pci_dev);
 -      pci_set_drvdata(pci_bus->pci_dev, NULL);
 -
 -      kfree(bus);
 -}
 -
  static void __devexit iwl_pci_remove(struct pci_dev *pdev)
  {
-       struct iwl_priv *priv = pci_get_drvdata(pdev);
-       struct iwl_bus *bus = priv->bus;
+       struct iwl_shared *shrd = pci_get_drvdata(pdev);
+       struct iwl_bus *bus = shrd->bus;
 +      struct iwl_pci_bus *pci_bus = IWL_BUS_GET_PCI_BUS(bus);
 +      struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus);
  
-       iwl_remove(priv);
+       iwl_remove(shrd->priv);
  
 -      iwl_pci_down(bus);
 +      pci_disable_msi(pci_dev);
 +      pci_iounmap(pci_dev, pci_bus->hw_base);
 +      pci_release_regions(pci_dev);
 +      pci_disable_device(pci_dev);
 +      pci_set_drvdata(pci_dev, NULL);
 +
 +      kfree(bus);
  }
  
- #ifdef CONFIG_PM
+ #ifdef CONFIG_PM_SLEEP
  
  static int iwl_pci_suspend(struct device *device)
  {

diff --cc drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
index 222d410c586e4e481a8c474471ed8702e41aac90,5dd6a6d1dfd731f67fba04b3a727ba37e507ecc3..51688dedeaf218017508d224db69c2cb9f51c987
--- 1/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
--- 2/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
@@@ -771,9 -921,8 +921,10 @@@ void iwl_tx_cmd_complete(struct iwl_pri
        cmd = txq->cmd[cmd_index];
        meta = &txq->meta[cmd_index];
  
-       iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
 +      txq->time_stamp = jiffies;
 +
+       iwlagn_unmap_tfd(trans, meta, &txq->tfds[index],
+                        DMA_BIDIRECTIONAL);
  
        /* Input error checking is done when commands are added to queue. */
        if (meta->flags & CMD_WANT_SKB) {

diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/acx.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/main.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/sdio.c
Simple merge

diff --cc drivers/s390/cio/qdio_main.c
index a122c1c3320f3c0f32af0c913b1b263cc81891dc,9a122280246c1783485af4140d9785cefadca976..7ded1b26fd25615c0c001df9c4182410fadd203f
--- 1/drivers/s390/cio/qdio_main.c
--- 2/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@@ -14,6 -14,8 +14,7 @@@
  #include <linux/timer.h>
  #include <linux/delay.h>
  #include <linux/gfp.h>
 -#include <linux/kernel_stat.h>
+ #include <linux/io.h>
  #include <linux/atomic.h>
  #include <asm/debug.h>
  #include <asm/qdio.h>

diff --cc drivers/s390/cio/qdio_setup.c
Simple merge

diff --cc drivers/s390/net/lcs.c
Simple merge

diff --cc drivers/scsi/bnx2fc/bnx2fc.h
Simple merge

diff --cc drivers/scsi/bnx2fc/bnx2fc_fcoe.c
Simple merge

diff --cc drivers/scsi/fcoe/fcoe.c
Simple merge

diff --cc drivers/scsi/fcoe/fcoe_transport.c
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc net/bridge/br_if.c
Simple merge

diff --cc net/can/af_can.c
Simple merge

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

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

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

diff --cc net/core/skbuff.c
index 387703f56fcef6784d0d449e38d4cd73cdf8ce3e,296afd0aa8d28793fce91fd130428a9a9faf5beb..5b2c5f1d4dba0edf44769c512443325d9055b756
--- 1/net/core/skbuff.c
--- 2/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@@ -909,9 -898,10 +911,9 @@@ int pskb_expand_head(struct sk_buff *sk
                if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
                        if (skb_copy_ubufs(skb, gfp_mask))
                                goto nofrags;
 -                      skb_shinfo(skb)->tx_flags &= ~SKBTX_DEV_ZEROCOPY;
                }
                for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
-                       get_page(skb_shinfo(skb)->frags[i].page);
+                       skb_frag_ref(skb, i);
  
                if (skb_has_frag_list(skb))
                        skb_clone_fraglist(skb);

diff --cc net/ipv4/igmp.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/raw.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge

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

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

diff --cc net/sctp/sm_statefuns.c
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge