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, 6 insertions, 10 deletions

diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 6dfa69899019..74b7ae76906e 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -1173,7 +1173,7 @@ static void tx_timeout(struct net_device *dev)
 
         /* Trigger an immediate transmit demand. */
 
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         np->stats.tx_errors++;
         netif_wake_queue(dev);
 }
@@ -1221,8 +1221,6 @@ static void init_ring(struct net_device *dev)
 
         for (i = 0; i < TX_RING_SIZE; i++)
                 memset(&np->tx_info[i], 0, sizeof(np->tx_info[i]));
-
-        return;
 }
 
 
@@ -1312,8 +1310,6 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)
         if ((np->cur_tx - np->dirty_tx) + 4 > TX_RING_SIZE)
                 netif_stop_queue(dev);
 
-        dev->trans_start = jiffies;
-
         return NETDEV_TX_OK;
 }
 
@@ -1766,7 +1762,7 @@ static void set_rx_mode(struct net_device *dev)
         struct netdev_private *np = netdev_priv(dev);
         void __iomem *ioaddr = np->base;
         u32 rx_mode = MinVLANPrio;
-        struct dev_mc_list *mclist;
+        struct netdev_hw_addr *ha;
         int i;
 #ifdef VLAN_SUPPORT
 
@@ -1804,8 +1800,8 @@ static void set_rx_mode(struct net_device *dev)
                 /* Use the 16 element perfect filter, skip first two entries. */
                 void __iomem *filter_addr = ioaddr + PerfFilterTable + 2 * 16;
                 __be16 *eaddrs;
-                netdev_for_each_mc_addr(mclist, dev) {
-                        eaddrs = (__be16 *)mclist->dmi_addr;
+                netdev_for_each_mc_addr(ha, dev) {
+                        eaddrs = (__be16 *) ha->addr;
                         writew(be16_to_cpu(eaddrs[2]), filter_addr); filter_addr += 4;
                         writew(be16_to_cpu(eaddrs[1]), filter_addr); filter_addr += 4;
                         writew(be16_to_cpu(eaddrs[0]), filter_addr); filter_addr += 8;
@@ -1825,10 +1821,10 @@ static void set_rx_mode(struct net_device *dev)
                 __le16 mc_filter[32] __attribute__ ((aligned(sizeof(long))));   /* Multicast hash filter */
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                netdev_for_each_mc_addr(mclist, dev) {
+                netdev_for_each_mc_addr(ha, dev) {
                         /* The chip uses the upper 9 CRC bits
                            as index into the hash table */
-                        int bit_nr = ether_crc_le(ETH_ALEN, mclist->dmi_addr) >> 23;
+                        int bit_nr = ether_crc_le(ETH_ALEN, ha->addr) >> 23;
                         __le32 *fptr = (__le32 *) &mc_filter[(bit_nr >> 4) & ~1];
 
                         *fptr |= cpu_to_le32(1 << (bit_nr & 31));