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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c

1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 084d78dd1637..c200c2821730 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -448,7 +448,7 @@ static void pcnet32_netif_stop(struct net_device *dev)
 {
         struct pcnet32_private *lp = netdev_priv(dev);
 
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         napi_disable(&lp->napi);
         netif_tx_disable(dev);
 }
@@ -647,7 +647,6 @@ free_new_rx_ring:
                             (1 << size),
                             new_rx_ring,
                             new_ring_dma_addr);
-        return;
 }
 
 static void pcnet32_purge_rx_ring(struct net_device *dev)
@@ -1215,7 +1214,6 @@ static void pcnet32_rx_entry(struct net_device *dev,
         skb->protocol = eth_type_trans(skb, dev);
         netif_receive_skb(skb);
         dev->stats.rx_packets++;
-        return;
 }
 
 static int pcnet32_rx(struct net_device *dev, int budget)
@@ -2398,7 +2396,7 @@ static void pcnet32_tx_timeout(struct net_device *dev)
         }
         pcnet32_restart(dev, CSR0_NORMAL);
 
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         netif_wake_queue(dev);
 
         spin_unlock_irqrestore(&lp->lock, flags);
@@ -2449,8 +2447,6 @@ static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb,
         /* Trigger an immediate send poll. */
         lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
 
-        dev->trans_start = jiffies;
-
         if (lp->tx_ring[(entry + 1) & lp->tx_mod_mask].base != 0) {
                 lp->tx_full = 1;
                 netif_stop_queue(dev);
@@ -2590,7 +2586,7 @@ static void pcnet32_load_multicast(struct net_device *dev)
         struct pcnet32_private *lp = netdev_priv(dev);
         volatile struct pcnet32_init_block *ib = lp->init_block;
         volatile __le16 *mcast_table = (__le16 *)ib->filter;
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         unsigned long ioaddr = dev->base_addr;
         char *addrs;
         int i;
@@ -2611,8 +2607,8 @@ static void pcnet32_load_multicast(struct net_device *dev)
         ib->filter[1] = 0;
 
         /* Add addresses */
-        netdev_for_each_mc_addr(dmi, dev) {
-                addrs = dmi->dmi_addr;
+        netdev_for_each_mc_addr(ha, dev) {
+                addrs = ha->addr;
 
                 /* multicast address? */
                 if (!(*addrs & 1))
@@ -2625,7 +2621,6 @@ static void pcnet32_load_multicast(struct net_device *dev)
         for (i = 0; i < 4; i++)
                 lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
                                 le16_to_cpu(mcast_table[i]));
-        return;
 }
 
 /*