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, 24 insertions, 13 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index dc5018a6d9ed..a441aad922c2 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2876,7 +2876,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
         ai->wep_capable = (cap_rid.softCap & cpu_to_le16(0x02)) ? 1 : 0;
         ai->max_wep_idx = (cap_rid.softCap & cpu_to_le16(0x80)) ? 3 : 0;
 
-        airo_print_info(dev->name, "Firmware version %x.%x.%02x",
+        airo_print_info(dev->name, "Firmware version %x.%x.%02d",
                         ((le16_to_cpu(cap_rid.softVer) >> 8) & 0xF),
                         (le16_to_cpu(cap_rid.softVer) & 0xFF),
                         le16_to_cpu(cap_rid.softSubVer));
@@ -3193,19 +3193,26 @@ static void airo_print_status(const char *devname, u16 status)
 {
         u8 reason = status & 0xFF;
 
-        switch (status) {
+        switch (status & 0xFF00) {
         case STAT_NOBEACON:
-                airo_print_dbg(devname, "link lost (missed beacons)");
-                break;
-        case STAT_MAXRETRIES:
-        case STAT_MAXARL:
-                airo_print_dbg(devname, "link lost (max retries)");
-                break;
-        case STAT_FORCELOSS:
-                airo_print_dbg(devname, "link lost (local choice)");
-                break;
-        case STAT_TSFSYNC:
-                airo_print_dbg(devname, "link lost (TSF sync lost)");
+                switch (status) {
+                case STAT_NOBEACON:
+                        airo_print_dbg(devname, "link lost (missed beacons)");
+                        break;
+                case STAT_MAXRETRIES:
+                case STAT_MAXARL:
+                        airo_print_dbg(devname, "link lost (max retries)");
+                        break;
+                case STAT_FORCELOSS:
+                        airo_print_dbg(devname, "link lost (local choice)");
+                        break;
+                case STAT_TSFSYNC:
+                        airo_print_dbg(devname, "link lost (TSF sync lost)");
+                        break;
+                default:
+                        airo_print_dbg(devname, "unknow status %x\n", status);
+                        break;
+                }
                 break;
         case STAT_DEAUTH:
                 airo_print_dbg(devname, "deauthenticated (reason: %d)", reason);
@@ -3221,7 +3228,11 @@ static void airo_print_status(const char *devname, u16 status)
                 airo_print_dbg(devname, "authentication failed (reason: %d)",
                                reason);
                 break;
+        case STAT_ASSOC:
+        case STAT_REASSOC:
+                break;
         default:
+                airo_print_dbg(devname, "unknow status %x\n", status);
                 break;
         }
 }