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, 4 insertions, 4 deletions

diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index 7d6cf3340c11..294ccfb427cf 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -384,7 +384,7 @@ static void InitBoard(struct net_device *dev)
         int camcnt;
         camentry_t cams[16];
         u32 cammask;
-        struct dev_mc_list *mcptr;
+        struct netdev_hw_addr *ha;
         u16 rcrval;
 
         /* reset the SONIC */
@@ -419,8 +419,8 @@ static void InitBoard(struct net_device *dev)
         /* start putting the multicast addresses into the CAM list.  Stop if
            it is full. */
 
-        netdev_for_each_mc_addr(mcptr, dev) {
-                putcam(cams, &camcnt, mcptr->dmi_addr);
+        netdev_for_each_mc_addr(ha, dev) {
+                putcam(cams, &camcnt, ha->addr);
                 if (camcnt == 16)
                         break;
         }
@@ -478,7 +478,7 @@ static void InitBoard(struct net_device *dev)
         /* if still multicast addresses left or ALLMULTI is set, set the multicast
            enable bit */
 
-        if ((dev->flags & IFF_ALLMULTI) || (mcptr != NULL))
+        if ((dev->flags & IFF_ALLMULTI) || netdev_mc_count(dev) > camcnt)
                 rcrval |= RCREG_AMC;
 
         /* promiscous mode ? */