From: "Pali Rohár" <pali.rohar@gmail.com>
To: Pavel Machek <pavel@ucw.cz>
Cc: sre@debian.org, sre@ring0.de, kernel list <linux-kernel@vger.kernel.org>
Subject: Re: hci_h4p from linux-n900 branch: fix with new bluetooth for 3.13-rc1
Date: Wed, 27 Nov 2013 15:59:21 +0100 [thread overview]
Message-ID: <201311271559.21855@pali> (raw)
In-Reply-To: <20131127125149.GA9389@amd.pavel.ucw.cz>
[-- Attachment #1: Type: Text/Plain, Size: 2507 bytes --]
Hi, I already have this patch prepared for 3.13.
On Wednesday 27 November 2013 13:51:50 Pavel Machek wrote:
> commit d18adf907651766c97eedae993f14c6e042914a6
> Author: Pavel <pavel@ucw.cz>
> Date: Wed Nov 27 13:43:40 2013 +0100
>
> Fix compilation of hci_h4p after bluetooth core changes. Only
> compile tested.
>
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
>
> --
>
> When you update to 3.13-rc1, you'll likely need this one.
>
> (And good news is that it boots with that kernel, and video
> seems to work.)
>
> index 7ed9d4e..dac3875 100644
> --- a/drivers/bluetooth/hci_h4p/core.c
> +++ b/drivers/bluetooth/hci_h4p/core.c
> @@ -405,7 +405,7 @@ static inline void
> hci_h4p_recv_frame(struct hci_h4p_info *info, }
> hci_h4p_parse_fw_event(info, skb);
> } else {
> - hci_recv_frame(skb);
> + hci_recv_frame(info->hdev, skb);
> NBT_DBG("Frame sent to upper layer\n");
> }
> }
> @@ -789,10 +789,9 @@ static int hci_h4p_hci_close(struct
> hci_dev *hdev) return 0;
> }
>
> -static int hci_h4p_hci_send_frame(struct sk_buff *skb)
> +static int hci_h4p_hci_send_frame(struct hci_dev *hdev,
> struct sk_buff *skb) {
> struct hci_h4p_info *info;
> - struct hci_dev *hdev = (struct hci_dev *)skb->dev;
> int err = 0;
> unsigned long flags;
>
> @@ -841,12 +840,6 @@ static int hci_h4p_hci_send_frame(struct
> sk_buff *skb) return 0;
> }
>
> -static int hci_h4p_hci_ioctl(struct hci_dev *hdev, unsigned
> int cmd, - unsigned long arg)
> -{
> - return -ENOIOCTLCMD;
> -}
> -
> static int hci_h4p_register_hdev(struct hci_h4p_info *info)
> {
> struct hci_dev *hdev;
> @@ -867,7 +860,6 @@ static int hci_h4p_register_hdev(struct
> hci_h4p_info *info) hdev->close = hci_h4p_hci_close;
> hdev->flush = hci_h4p_hci_flush;
> hdev->send = hci_h4p_hci_send_frame;
> - hdev->ioctl = hci_h4p_hci_ioctl;
> set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
>
> SET_HCIDEV_DEV(hdev, info->dev);
> diff --git a/drivers/bluetooth/hci_h4p/fw-csr.c
> b/drivers/bluetooth/hci_h4p/fw-csr.c index af880d9..020fa52
> 100644
> --- a/drivers/bluetooth/hci_h4p/fw-csr.c
> +++ b/drivers/bluetooth/hci_h4p/fw-csr.c
> @@ -31,7 +31,7 @@ void hci_h4p_bc4_parse_fw_event(struct
> hci_h4p_info *info, struct sk_buff *skb) {
> /* Check if this is fw packet */
> if (skb->data[0] != 0xff) {
> - hci_recv_frame(skb);
> + hci_recv_frame(info->hdev, skb);
> return;
> }
--
Pali Rohár
pali.rohar@gmail.com
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2013-11-27 14:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-27 12:51 hci_h4p from linux-n900 branch: fix with new bluetooth for 3.13-rc1 Pavel Machek
2013-11-27 14:59 ` Pali Rohár [this message]
2013-11-27 19:13 ` Pavel Machek
2013-11-27 19:44 ` Pali Rohár
2013-11-29 23:58 ` Pali Rohár
2013-11-30 17:29 ` Pavel Machek
2013-11-30 23:15 ` device-tree based boot on linux-n900 branch Pavel Machek
2013-12-01 9:50 ` Pali Rohár
2013-12-01 10:24 ` Sebastian Reichel
2013-12-01 19:21 ` Compile failure on linux-n900 branch -- MEDIA_CAMERA_SUPPORT needed for n900 compilation Pavel Machek
2013-12-01 19:25 ` Pali Rohár
2013-12-01 20:01 ` Pavel Machek
2013-12-01 20:25 ` Pavel Machek
2013-12-01 20:36 ` Pali Rohár
2013-12-02 9:23 ` linux-n900: minor coding style fixes Pavel Machek
2013-12-01 20:29 ` Compile failure on linux-n900 branch -- MEDIA_CAMERA_SUPPORT needed for n900 compilation Pali Rohár
2013-12-01 10:48 ` hci_h4p from linux-n900 branch: fix with new bluetooth for 3.13-rc1 Sebastian Reichel
2013-12-01 11:16 ` Pali Rohár
2013-12-01 11:30 ` Sebastian Reichel
[not found] ` <201312021613.19521@pali>
[not found] ` <20131204122204.GA10262@amd.pavel.ucw.cz>
[not found] ` <201312041732.05400@pali>
2013-12-05 11:56 ` [patch] fix n900 bt error handling Pavel Machek
2013-12-05 13:08 ` Pali Rohár
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201311271559.21855@pali \
--to=pali.rohar@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=sre@debian.org \
--cc=sre@ring0.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox