diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2014-03-20 20:05:44 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-03-20 20:29:48 -0700 |
| commit | d986b4a6480bdd55c073635ef883c754e46ac0eb (patch) | |
| tree | a3d8af7d195ba3d9252b3ecc196ea5ea6fde7620 /drivers/bluetooth | |
| parent | 61b1a7fbda6f761ebe16a62124578ca0779d9365 (diff) | |
| download | linux-stable-d986b4a6480bdd55c073635ef883c754e46ac0eb.tar.gz linux-stable-d986b4a6480bdd55c073635ef883c754e46ac0eb.tar.bz2 linux-stable-d986b4a6480bdd55c073635ef883c754e46ac0eb.zip | |
Bluetooth: btmrvl: don't consume all vendor specific events
If vendor specific HCI commands are received from application,
we should send corresponding events to stack.
These events should be consumed in driver, only if they are for
the internal HCI commands generated by driver.
This patch fixes the vendor command 0x3f stuck problem with
above mentioned change. For example,
hcitool cmd 3f 22 fe 06 22 21 20 43 50 00
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btmrvl_main.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c index 1e0320af00c6..2c4997ce2484 100644 --- a/drivers/bluetooth/btmrvl_main.c +++ b/drivers/bluetooth/btmrvl_main.c @@ -59,12 +59,13 @@ bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb) priv->btmrvl_dev.sendcmdflag = false; priv->adapter->cmd_complete = true; wake_up_interruptible(&priv->adapter->cmd_wait_q); - } - if (hci_opcode_ogf(opcode) == 0x3F) { - BT_DBG("vendor event skipped: opcode=%#4.4x", opcode); - kfree_skb(skb); - return false; + if (hci_opcode_ogf(opcode) == 0x3F) { + BT_DBG("vendor event skipped: opcode=%#4.4x", + opcode); + kfree_skb(skb); + return false; + } } } |