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

4 files changed, 9 insertions, 11 deletions

diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 0770e2f6da6b..0fb0fefcb787 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -674,8 +674,6 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                 skb->data, skb->len, DMA_TO_DEVICE));
         CBDW_DATLEN(bdp, skb->len);
 
-        dev->trans_start = jiffies;
-
         /*
          * If this was the last BD in the ring, start at the beginning again.
          */
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index 0a973e71876b..714da967fa19 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
@@ -231,12 +231,12 @@ static void set_multicast_finish(struct net_device *dev)
 
 static void set_multicast_list(struct net_device *dev)
 {
-        struct dev_mc_list *pmc;
+        struct netdev_hw_addr *ha;
 
         if ((dev->flags & IFF_PROMISC) == 0) {
                 set_multicast_start(dev);
-                netdev_for_each_mc_addr(pmc, dev)
-                        set_multicast_one(dev, pmc->dmi_addr);
+                netdev_for_each_mc_addr(ha, dev)
+                        set_multicast_one(dev, ha->addr);
                 set_multicast_finish(dev);
         } else
                 set_promiscuous_mode(dev);
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index ec81f50d5919..7eff92ef01da 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -232,12 +232,12 @@ static void set_multicast_finish(struct net_device *dev)
 
 static void set_multicast_list(struct net_device *dev)
 {
-        struct dev_mc_list *pmc;
+        struct netdev_hw_addr *ha;
 
         if ((dev->flags & IFF_PROMISC) == 0) {
                 set_multicast_start(dev);
-                netdev_for_each_mc_addr(pmc, dev)
-                        set_multicast_one(dev, pmc->dmi_addr);
+                netdev_for_each_mc_addr(ha, dev)
+                        set_multicast_one(dev, ha->addr);
                 set_multicast_finish(dev);
         } else
                 set_promiscuous_mode(dev);
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 34d3da751eb4..7f0591e43cd9 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -223,12 +223,12 @@ static void set_multicast_finish(struct net_device *dev)
 
 static void set_multicast_list(struct net_device *dev)
 {
-        struct dev_mc_list *pmc;
+        struct netdev_hw_addr *ha;
 
         if ((dev->flags & IFF_PROMISC) == 0) {
                 set_multicast_start(dev);
-                netdev_for_each_mc_addr(pmc, dev)
-                        set_multicast_one(dev, pmc->dmi_addr);
+                netdev_for_each_mc_addr(ha, dev)
+                        set_multicast_one(dev, ha->addr);
                 set_multicast_finish(dev);
         } else
                 set_promiscuous_mode(dev);