2020-07-11 04:36:19

by Mark O'Donovan

Subject: [PATCH 1/1] ath9k: Fix regression with Atheros 9271

This fix allows ath9k_htc modules to connect to WLAN once again.

Fixes: 2bbcaaee1fcb (ath9k: Fix general protection fault in
ath9k_hif_usb_rx_cb )

https://bugzilla.kernel.org/show_bug.cgi?id=208251

Signed-off-by: Mark O'Donovan <[email protected]>
---
drivers/net/wireless/ath/ath9k/hif_usb.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 4ed21dad6a8e..3f563e02d17d 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -733,11 +733,13 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
return;
}

+ rx_buf->skb = nskb;
+
usb_fill_int_urb(urb, hif_dev->udev,
usb_rcvintpipe(hif_dev->udev,
USB_REG_IN_PIPE),
nskb->data, MAX_REG_IN_BUF_SIZE,
- ath9k_hif_usb_reg_in_cb, nskb, 1);
+ ath9k_hif_usb_reg_in_cb, rx_buf, 1);
}

resubmit:
--
2.25.1

2020-07-15 15:19:57

by Kalle Valo

Subject: Re: [PATCH 1/1] ath9k: Fix regression with Atheros 9271

Mark O'Donovan <[email protected]> wrote:

> This fix allows ath9k_htc modules to connect to WLAN once again.
>
> Fixes: 2bbcaaee1fcb (ath9k: Fix general protection fault in
> ath9k_hif_usb_rx_cb )
>
> https://bugzilla.kernel.org/show_bug.cgi?id=208251

These should be:

Fixes: 2bbcaaee1fcb ("ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb")
Link: https://bugzilla.kernel.org/show_bug.cgi?id=208251

But I can fix those during commit.

There are basically two options now, either take this patch or revert commit 2bbcaaee1fcb:

https://patchwork.kernel.org/patch/11637341/

I prefer taking Mark's patch but I would appreciate if people could provide
testing feedback.

--
https://patchwork.kernel.org/patch/11657669/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2020-07-16 08:05:04

by Viktor Jägersküpper

Subject: Re: [PATCH 1/1] ath9k: Fix regression with Atheros 9271

[I fixed my e-mail address and CC'ed Roman]

Mark O'Donovan:
> This fix allows ath9k_htc modules to connect to WLAN once again.
>
> Fixes: 2bbcaaee1fcb (ath9k: Fix general protection fault in
> ath9k_hif_usb_rx_cb )
>
> https://bugzilla.kernel.org/show_bug.cgi?id=208251
>
> Signed-off-by: Mark O'Donovan <[email protected]>

This fixes the issue for me. Please don't forget:
Reported-by: Roman Mamedov <[email protected]>

And if you want to add this:
Tested-by: Viktor Jägersküpper <[email protected]>

These additional lines are mainly useful if the patch doesn't work for someone
else and they decide to report it, so hopefully Roman and I would receive the
report, too. And we already have three threads for this bug.

> ---
> drivers/net/wireless/ath/ath9k/hif_usb.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
> index 4ed21dad6a8e..3f563e02d17d 100644
> --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
> +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
> @@ -733,11 +733,13 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
> return;
> }
>
> + rx_buf->skb = nskb;
> +
> usb_fill_int_urb(urb, hif_dev->udev,
> usb_rcvintpipe(hif_dev->udev,
> USB_REG_IN_PIPE),
> nskb->data, MAX_REG_IN_BUF_SIZE,
> - ath9k_hif_usb_reg_in_cb, nskb, 1);
> + ath9k_hif_usb_reg_in_cb, rx_buf, 1);
> }
>
> resubmit:
>

2020-07-16 09:11:02

by Kalle Valo

Subject: Re: [PATCH 1/1] ath9k: Fix regression with Atheros 9271

Viktor Jägersküpper <[email protected]> writes:

> [I fixed my e-mail address and CC'ed Roman]
>
> Mark O'Donovan:
>> This fix allows ath9k_htc modules to connect to WLAN once again.
>>
>> Fixes: 2bbcaaee1fcb (ath9k: Fix general protection fault in
>> ath9k_hif_usb_rx_cb )
>>
>> https://bugzilla.kernel.org/show_bug.cgi?id=208251
>>
>> Signed-off-by: Mark O'Donovan <[email protected]>
>
> This fixes the issue for me. Please don't forget:
> Reported-by: Roman Mamedov <[email protected]>
>
> And if you want to add this:
> Tested-by: Viktor Jägersküpper <[email protected]>
>
> These additional lines are mainly useful if the patch doesn't work for someone
> else and they decide to report it, so hopefully Roman and I would receive the
> report, too. And we already have three threads for this bug.

Thanks, I will. Or well, actually patchwork automatically does that :)

--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2020-07-20 16:41:20

by Kalle Valo

Subject: Re: [PATCH 1/1] ath9k: Fix regression with Atheros 9271

Mark O'Donovan <[email protected]> wrote:

> This fix allows ath9k_htc modules to connect to WLAN once again.
>
> Fixes: 2bbcaaee1fcb ("ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb")
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=208251
> Signed-off-by: Mark O'Donovan <[email protected]>
> Reported-by: Roman Mamedov <[email protected]>
> Tested-by: Viktor Jägersküpper <[email protected]>

Patch applied to wireless-drivers.git, thanks.

92f53e2fda8b ath9k: Fix regression with Atheros 9271

--
https://patchwork.kernel.org/patch/11657669/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches