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

6 files changed, 76 insertions, 43 deletions

diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index 204727586ee9..bed0ba630235 100644
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -42,6 +42,8 @@ struct btmrvl_device {
         void *card;
         struct hci_dev *hcidev;
 
+        u8 dev_type;
+
         u8 tx_dnld_rdy;
 
         u8 psmode;
@@ -88,8 +90,11 @@ struct btmrvl_private {
 #define BT_CMD_HOST_SLEEP_ENABLE        0x5A
 #define BT_CMD_MODULE_CFG_REQ           0x5B
 
-/* Sub-commands: Module Bringup/Shutdown Request */
+/* Sub-commands: Module Bringup/Shutdown Request/Response */
 #define MODULE_BRINGUP_REQ              0xF1
+#define MODULE_BROUGHT_UP               0x00
+#define MODULE_ALREADY_UP               0x0C
+
 #define MODULE_SHUTDOWN_REQ             0xF2
 
 #define BT_EVENT_POWER_STATE            0x20
@@ -123,6 +128,7 @@ struct btmrvl_event {
 
 /* Prototype of global function */
 
+int btmrvl_register_hdev(struct btmrvl_private *priv);
 struct btmrvl_private *btmrvl_add_card(void *card);
 int btmrvl_remove_card(struct btmrvl_private *priv);
 
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 53a43adf2e21..ee37ef0caee2 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -66,7 +66,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
 {
         struct btmrvl_adapter *adapter = priv->adapter;
         struct btmrvl_event *event;
-        u8 ret = 0;
+        int ret = 0;
 
         event = (struct btmrvl_event *) skb->data;
         if (event->ec != 0xff) {
@@ -112,8 +112,17 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
         case BT_CMD_MODULE_CFG_REQ:
                 if (priv->btmrvl_dev.sendcmdflag &&
                                 event->data[1] == MODULE_BRINGUP_REQ) {
-                        BT_DBG("EVENT:%s", (event->data[2]) ?
-                                "Bring-up failed" : "Bring-up succeed");
+                        BT_DBG("EVENT:%s",
+                                ((event->data[2] == MODULE_BROUGHT_UP) ||
+                                (event->data[2] == MODULE_ALREADY_UP)) ?
+                                "Bring-up succeed" : "Bring-up failed");
+
+                        if (event->length > 3)
+                                priv->btmrvl_dev.dev_type = event->data[3];
+                        else
+                                priv->btmrvl_dev.dev_type = HCI_BREDR;
+
+                        BT_DBG("dev_type: %d", priv->btmrvl_dev.dev_type);
                 } else if (priv->btmrvl_dev.sendcmdflag &&
                                 event->data[1] == MODULE_SHUTDOWN_REQ) {
                         BT_DBG("EVENT:%s", (event->data[2]) ?
@@ -522,47 +531,20 @@ static int btmrvl_service_main_thread(void *data)
         return 0;
 }
 
-struct btmrvl_private *btmrvl_add_card(void *card)
+int btmrvl_register_hdev(struct btmrvl_private *priv)
 {
         struct hci_dev *hdev = NULL;
-        struct btmrvl_private *priv;
         int ret;
 
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-        if (!priv) {
-                BT_ERR("Can not allocate priv");
-                goto err_priv;
-        }
-
-        priv->adapter = kzalloc(sizeof(*priv->adapter), GFP_KERNEL);
-        if (!priv->adapter) {
-                BT_ERR("Allocate buffer for btmrvl_adapter failed!");
-                goto err_adapter;
-        }
-
-        btmrvl_init_adapter(priv);
-
         hdev = hci_alloc_dev();
         if (!hdev) {
                 BT_ERR("Can not allocate HCI device");
                 goto err_hdev;
         }
 
-        BT_DBG("Starting kthread...");
-        priv->main_thread.priv = priv;
-        spin_lock_init(&priv->driver_lock);
-
-        init_waitqueue_head(&priv->main_thread.wait_q);
-        priv->main_thread.task = kthread_run(btmrvl_service_main_thread,
-                                &priv->main_thread, "btmrvl_main_service");
-
         priv->btmrvl_dev.hcidev = hdev;
-        priv->btmrvl_dev.card = card;
-
         hdev->driver_data = priv;
 
-        priv->btmrvl_dev.tx_dnld_rdy = true;
-
         hdev->bus = HCI_SDIO;
         hdev->open = btmrvl_open;
         hdev->close = btmrvl_close;
@@ -572,6 +554,10 @@ struct btmrvl_private *btmrvl_add_card(void *card)
         hdev->ioctl = btmrvl_ioctl;
         hdev->owner = THIS_MODULE;
 
+        btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ);
+
+        hdev->dev_type = priv->btmrvl_dev.dev_type;
+
         ret = hci_register_dev(hdev);
         if (ret < 0) {
                 BT_ERR("Can not register HCI device");
@@ -582,16 +568,52 @@ struct btmrvl_private *btmrvl_add_card(void *card)
         btmrvl_debugfs_init(hdev);
 #endif
 
-        return priv;
+        return 0;
 
 err_hci_register_dev:
-        /* Stop the thread servicing the interrupts */
-        kthread_stop(priv->main_thread.task);
-
         hci_free_dev(hdev);
 
 err_hdev:
+        /* Stop the thread servicing the interrupts */
+        kthread_stop(priv->main_thread.task);
+
         btmrvl_free_adapter(priv);
+        kfree(priv);
+
+        return -ENOMEM;
+}
+EXPORT_SYMBOL_GPL(btmrvl_register_hdev);
+
+struct btmrvl_private *btmrvl_add_card(void *card)
+{
+        struct btmrvl_private *priv;
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                BT_ERR("Can not allocate priv");
+                goto err_priv;
+        }
+
+        priv->adapter = kzalloc(sizeof(*priv->adapter), GFP_KERNEL);
+        if (!priv->adapter) {
+                BT_ERR("Allocate buffer for btmrvl_adapter failed!");
+                goto err_adapter;
+        }
+
+        btmrvl_init_adapter(priv);
+
+        BT_DBG("Starting kthread...");
+        priv->main_thread.priv = priv;
+        spin_lock_init(&priv->driver_lock);
+
+        init_waitqueue_head(&priv->main_thread.wait_q);
+        priv->main_thread.task = kthread_run(btmrvl_service_main_thread,
+                                &priv->main_thread, "btmrvl_main_service");
+
+        priv->btmrvl_dev.card = card;
+        priv->btmrvl_dev.tx_dnld_rdy = true;
+
+        return priv;
 
 err_adapter:
         kfree(priv);
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index 0dba76aa2232..df0773ebd9e4 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -931,7 +931,12 @@ static int btmrvl_sdio_probe(struct sdio_func *func,
         priv->hw_host_to_card = btmrvl_sdio_host_to_card;
         priv->hw_wakeup_firmware = btmrvl_sdio_wakeup_fw;
 
-        btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ);
+        if (btmrvl_register_hdev(priv)) {
+                BT_ERR("Register hdev failed!");
+                ret = -ENODEV;
+                goto disable_host_int;
+        }
+
         priv->btmrvl_dev.psmode = 1;
         btmrvl_enable_ps(priv);
 
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index c0ce8134814e..3f038f5308a4 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -246,7 +246,7 @@ static int h4_recv(struct hci_uart *hu, void *data, int count)
                         BT_ERR("Can't allocate mem for new packet");
                         h4->rx_state = H4_W4_PACKET_TYPE;
                         h4->rx_count = 0;
-                        return 0;
+                        return -ENOMEM;
                 }
 
                 h4->rx_skb->dev = (void *) hu->hdev;
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index 5c65014635be..fb8445c7365e 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -402,7 +402,7 @@ static int ll_recv(struct hci_uart *hu, void *data, int count)
                                 continue;
 
                         case HCILL_W4_EVENT_HDR:
-                                eh = (struct hci_event_hdr *) ll->rx_skb->data;
+                                eh = hci_event_hdr(ll->rx_skb);
 
                                 BT_DBG("Event header: evt 0x%2.2x plen %d", eh->evt, eh->plen);
 
@@ -410,7 +410,7 @@ static int ll_recv(struct hci_uart *hu, void *data, int count)
                                 continue;
 
                         case HCILL_W4_ACL_HDR:
-                                ah = (struct hci_acl_hdr *) ll->rx_skb->data;
+                                ah = hci_acl_hdr(ll->rx_skb);
                                 dlen = __le16_to_cpu(ah->dlen);
 
                                 BT_DBG("ACL header: dlen %d", dlen);
@@ -419,7 +419,7 @@ static int ll_recv(struct hci_uart *hu, void *data, int count)
                                 continue;
 
                         case HCILL_W4_SCO_HDR:
-                                sh = (struct hci_sco_hdr *) ll->rx_skb->data;
+                                sh = hci_sco_hdr(ll->rx_skb);
 
                                 BT_DBG("SCO header: dlen %d", sh->dlen);
 
@@ -491,7 +491,7 @@ static int ll_recv(struct hci_uart *hu, void *data, int count)
                         BT_ERR("Can't allocate mem for new packet");
                         ll->rx_state = HCILL_W4_PACKET_TYPE;
                         ll->rx_count = 0;
-                        return 0;
+                        return -ENOMEM;
                 }
 
                 ll->rx_skb->dev = (void *) hu->hdev;
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index bb0aefdb4267..3aa7b2a54b6f 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -157,7 +157,7 @@ static inline ssize_t vhci_put_user(struct vhci_data *data,
                 break;
 
         case HCI_SCODATA_PKT:
-                data->hdev->stat.cmd_tx++;
+                data->hdev->stat.sco_tx++;
                 break;
         };