Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/bnx2x/bnx2x_ethtool.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bna/bfa_ioc.c
index c1c9e70eec2ff03835c47bfeb55ad444f8541560,7581518ecfa2eade4c4bb4cba60601e5f39b7be2..ba2a4e13cf4fea352898ede24d55a8deea99c295
--- 1/drivers/net/bna/bfa_ioc.c
--- 2/drivers/net/bna/bfa_ioc.c
+++ b/drivers/net/bna/bfa_ioc.c
@@@ -1505,10 -1511,10 +1510,10 @@@ bfa_ioc_hb_stop(struct bfa_ioc *ioc
   */
  static void
  bfa_ioc_download_fw(struct bfa_ioc *ioc, u32 boot_type,
-                   u32 boot_param)
+                   u32 boot_env)
  {
        u32 *fwimg;
 -      u32 pgnum, pgoff;
 +      u32 pgnum;
        u32 loff = 0;
        u32 chunkno = 0;
        u32 i;

diff --cc drivers/net/bna/bnad.c
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_ethtool.c
index e711a2292446153b9d7bde23258892e57b47ab80,89cb977898cb5cfbce98bd53422c9d27128761e5..4f42c314986cb2709c17b72998f4c2afc99084f0
--- 1/drivers/net/bnx2x/bnx2x_ethtool.c
--- 2/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
@@@ -2013,38 -2097,35 +2013,37 @@@ static void bnx2x_get_ethtool_stats(str
        }
  }
  
 -static int bnx2x_phys_id(struct net_device *dev, u32 data)
 +static int bnx2x_set_phys_id(struct net_device *dev,
 +                           enum ethtool_phys_id_state state)
  {
        struct bnx2x *bp = netdev_priv(dev);
 -      int i;
  
        if (!netif_running(dev))
 -              return 0;
 +              return -EAGAIN;
  
        if (!bp->port.pmf)
 -              return 0;
 +              return -EOPNOTSUPP;
  
 -      if (data == 0)
 -              data = 2;
 +      switch (state) {
 +      case ETHTOOL_ID_ACTIVE:
 +              return 1;       /* cycle on/off once per second */
  
 -      for (i = 0; i < (data * 2); i++) {
 -              if ((i % 2) == 0)
 -                      bnx2x_set_led(&bp->link_params, &bp->link_vars,
 -                                    LED_MODE_ON, SPEED_1000);
 -              else
 -                      bnx2x_set_led(&bp->link_params, &bp->link_vars,
 -                                    LED_MODE_FRONT_PANEL_OFF, 0);
 +      case ETHTOOL_ID_ON:
 +              bnx2x_set_led(&bp->link_params, &bp->link_vars,
-                             LED_MODE_OPER, SPEED_1000);
++                            LED_MODE_ON, SPEED_1000);
 +              break;
  
 -              msleep_interruptible(500);
 -              if (signal_pending(current))
 -                      break;
 -      }
 +      case ETHTOOL_ID_OFF:
 +              bnx2x_set_led(&bp->link_params, &bp->link_vars,
-                             LED_MODE_OFF, 0);
++                            LED_MODE_FRONT_PANEL_OFF, 0);
 +
 +              break;
  
 -      bnx2x_set_led(&bp->link_params, &bp->link_vars,
 -                    LED_MODE_OPER, bp->link_vars.line_speed);
 +      case ETHTOOL_ID_INACTIVE:
-               if (bp->link_vars.link_up)
-                       bnx2x_set_led(&bp->link_params, &bp->link_vars,
-                                     LED_MODE_OPER,
-                                     bp->link_vars.line_speed);
++              bnx2x_set_led(&bp->link_params, &bp->link_vars,
++                            LED_MODE_OPER,
++                            bp->link_vars.line_speed);
 +      }
  
        return 0;
  }

diff --cc drivers/net/qlcnic/qlcnic.h
Simple merge

diff --cc drivers/net/qlcnic/qlcnic_main.c
index 7f9edb2f14748d705de6d80e63344efe66ff5594,cb1a1ef36c0ade56ddb5dfb98c2ef2ce8813b100..e9e9ba6efc5f5e9209916643bf71ca781c1c6f7e
--- 1/drivers/net/qlcnic/qlcnic_main.c
--- 2/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@@ -2157,9 -2119,26 +2158,22 @@@ qlcnic_xmit_frame(struct sk_buff *skb, 
        }
  
        frag_count = skb_shinfo(skb)->nr_frags + 1;
+       /* 14 frags supported for normal packet and
+        * 32 frags supported for TSO packet
+        */
+       if (!skb_is_gso(skb) && frag_count > QLCNIC_MAX_FRAGS_PER_TX) {
+ 
+               for (i = 0; i < (frag_count - QLCNIC_MAX_FRAGS_PER_TX); i++)
+                       delta += skb_shinfo(skb)->frags[i].size;
+ 
+               if (!__pskb_pull_tail(skb, delta))
+                       goto drop_packet;
+ 
+               frag_count = 1 + skb_shinfo(skb)->nr_frags;
+       }
  
 -      /* 4 fragments per cmd des */
 -      no_of_desc = (frag_count + 3) >> 2;
 -
        if (unlikely(qlcnic_tx_avail(tx_ring) <= TX_STOP_THRESH)) {
                netif_stop_queue(netdev);
 -              smp_mb();
                if (qlcnic_tx_avail(tx_ring) > TX_STOP_THRESH)
                        netif_start_queue(netdev);
                else {

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

diff --cc drivers/net/sfc/net_driver.h
Simple merge

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

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

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

diff --cc drivers/net/wireless/ath/ath9k/mac.c
index 6f431cbff38a3761df2329ffe4a92b9b8b598b3c,edc1cbbfecaf6fbd153ce00237f1101f49096edc..1968c67e3fababaa1eb357f482acfc9d46309530
--- 1/drivers/net/wireless/ath/ath9k/mac.c
--- 2/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@@ -710,12 -751,20 +710,19 @@@ void ath9k_hw_abortpcurecv(struct ath_h
  }
  EXPORT_SYMBOL(ath9k_hw_abortpcurecv);
  
- bool ath9k_hw_stopdmarecv(struct ath_hw *ah)
+ bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
  {
  #define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */
 -#define AH_RX_TIME_QUANTUM     100     /* usec */
        struct ath_common *common = ath9k_hw_common(ah);
+       u32 mac_status, last_mac_status = 0;
        int i;
  
+       /* Enable access to the DMA observation bus */
+       REG_WRITE(ah, AR_MACMISC,
+                 ((AR_MACMISC_DMA_OBS_LINE_8 << AR_MACMISC_DMA_OBS_S) |
+                  (AR_MACMISC_MISC_OBS_BUS_1 <<
+                   AR_MACMISC_MISC_OBS_BUS_MSB_S)));
+ 
        REG_WRITE(ah, AR_CR, AR_CR_RXD);
  
        /* Wait for rx enable bit to go low */

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

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

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