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, 8 insertions, 9 deletions

diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 60777fd90b33..3c58db595285 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -328,7 +328,7 @@ static int cpmac_config(struct net_device *dev, struct ifmap *map)
 
 static void cpmac_set_multicast_list(struct net_device *dev)
 {
-        struct dev_mc_list *iter;
+        struct netdev_hw_addr *ha;
         u8 tmp;
         u32 mbp, bit, hash[2] = { 0, };
         struct cpmac_priv *priv = netdev_priv(dev);
@@ -348,19 +348,19 @@ static void cpmac_set_multicast_list(struct net_device *dev)
                          * cpmac uses some strange mac address hashing
                          * (not crc32)
                          */
-                        netdev_for_each_mc_addr(iter, dev) {
+                        netdev_for_each_mc_addr(ha, dev) {
                                 bit = 0;
-                                tmp = iter->dmi_addr[0];
+                                tmp = ha->addr[0];
                                 bit  ^= (tmp >> 2) ^ (tmp << 4);
-                                tmp = iter->dmi_addr[1];
+                                tmp = ha->addr[1];
                                 bit  ^= (tmp >> 4) ^ (tmp << 2);
-                                tmp = iter->dmi_addr[2];
+                                tmp = ha->addr[2];
                                 bit  ^= (tmp >> 6) ^ tmp;
-                                tmp = iter->dmi_addr[3];
+                                tmp = ha->addr[3];
                                 bit  ^= (tmp >> 2) ^ (tmp << 4);
-                                tmp = iter->dmi_addr[4];
+                                tmp = ha->addr[4];
                                 bit  ^= (tmp >> 4) ^ (tmp << 2);
-                                tmp = iter->dmi_addr[5];
+                                tmp = ha->addr[5];
                                 bit  ^= (tmp >> 6) ^ tmp;
                                 bit &= 0x3f;
                                 hash[bit / 32] |= 1 << (bit % 32);
@@ -579,7 +579,6 @@ static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         spin_lock(&priv->lock);
-        dev->trans_start = jiffies;
         spin_unlock(&priv->lock);
         desc->dataflags = CPMAC_SOP | CPMAC_EOP | CPMAC_OWN;
         desc->skb = skb;