Merge branch 'master' of github.com:davem330/net

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

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

diff --cc MAINTAINERS
index 3891a12,ae8820e..5faf685
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1582,10 -1573,9 +1581,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 drivers/bcma/main.c
Simple merge

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

diff --cc drivers/net/ethernet/aeroflex/greth.c
Simple merge

diff --cc drivers/net/ethernet/aeroflex/greth.h
Simple merge

diff --cc drivers/net/ethernet/amd/am79c961a.c
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 8e9b87b,ba15bdc..818723c
--- 1/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
--- 2/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@@ -852,26 -852,20 +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/broadcom/tg3.c
index 1485013,4a1374d..26c6bd4
--- 1/drivers/net/ethernet/broadcom/tg3.c
--- 2/drivers/net/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@@ -6734,17 -6234,15 +6734,15 @@@ static netdev_tx_t tg3_start_xmit(struc
                }
        }
  
- #ifdef BCM_KERNEL_SUPPORTS_8021Q
 +      if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&
 +          !mss && skb->len > VLAN_ETH_FRAME_LEN)
 +              base_flags |= TXD_FLAG_JMB_PKT;
 +
        if (vlan_tx_tag_present(skb)) {
                base_flags |= TXD_FLAG_VLAN;
                vlan = vlan_tx_tag_get(skb);
        }
- #endif
  
 -      if (tg3_flag(tp, USE_JUMBO_BDFLAG) &&
 -          !mss && skb->len > VLAN_ETH_FRAME_LEN)
 -              base_flags |= TXD_FLAG_JMB_PKT;
 -
        len = skb_headlen(skb);
  
        mapping = pci_map_single(tp->pdev, skb->data, len, PCI_DMA_TODEVICE);

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

diff --cc drivers/net/ethernet/ibm/ibmveth.c
index 8cca4a6,8dd5fcc..72b84de
--- 1/drivers/net/ethernet/ibm/ibmveth.c
--- 2/drivers/net/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@@ -999,11 -1014,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/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/pxa168_eth.c
Simple merge

diff --cc drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
index 7efa624,0000000..00bc4fc
mode 100644,000000..100644
--- 1/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
--- /dev/null
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
@@@ -1,21 -1,0 +1,22 @@@
-       tristate "OKI SEMICONDUCTOR ML7223 IOH GbE (Intel EG20T PCH)"
 +#
 +# OKI Semiconductor device configuration
 +#
 +
 +config PCH_GBE
-         Output Hub), ML7223.
-         ML7223 IOH is for MP(Media Phone) use.
-         ML7223 is companion chip for Intel Atom E6xx series.
-         ML7223 is completely compatible for Intel EG20T PCH.
++      tristate "OKI SEMICONDUCTOR IOH(ML7223/ML7831) GbE"
 +      depends on PCI
 +      select NET_CORE
 +      select MII
 +      ---help---
 +        This is a gigabit ethernet driver for EG20T PCH.
 +        EG20T PCH is the platform controller hub that is used in Intel's
 +        general embedded platform.  EG20T PCH has Gigabit Ethernet interface.
 +        Using this interface, it is able to access system devices connected
 +        to Gigabit Ethernet.  This driver enables Gigabit Ethernet function.
 +
 +        This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
++        Output Hub), ML7223/ML7831.
++        ML7223 IOH is for MP(Media Phone) use. ML7831 IOH is for general
++        purpose use.
++        ML7223/ML7831 is companion chip for Intel Atom E6xx series.
++        ML7223/ML7831 is completely compatible for Intel EG20T PCH.

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/realtek/r8169.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/ppp/ppp_generic.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/b43/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-trans-tx-pcie.c
index ca686db,222d410..f6d823f
--- 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
@@@ -925,8 -771,9 +925,10 @@@ void iwl_tx_cmd_complete(struct iwl_tra
        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/rt2x00/rt2800lib.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
index 677b5ab,dbf501c..f156579
--- 1/drivers/net/wireless/rt2x00/rt2800usb.c
--- 2/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@@ -529,13 -538,11 +538,12 @@@ static void rt2800usb_txdone(struct rt2
                        entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
                        if (rt2800usb_txdone_entry_check(entry, reg))
                                break;
+                       entry = NULL;
                }
  
-               if (!entry || rt2x00queue_empty(queue))
-                       break;
- 
-               rt2800_txdone_entry(entry, reg,
-                                   rt2800usb_get_txwi(entry));
+               if (entry)
 -                      rt2800_txdone_entry(entry, reg);
++                      rt2800_txdone_entry(entry, reg,
++                                          rt2800usb_get_txwi(entry));
        }
  }
  

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/sdio.c
Simple merge

diff --cc drivers/scsi/fcoe/fcoe.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/fib_rules.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 296afd0,387703f..5b2c5f1
--- 1/net/core/skbuff.c
--- 2/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@@ -898,10 -909,9 +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_input.c
Simple merge

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

diff --cc net/ipv6/addrconf.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/core.c
Simple merge

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