summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark O'Donovan <shiftee@posteo.net>2020-07-11 05:33:24 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-29 10:20:01 +0200
commitdcb80ffe3825fb551a293491424695198b2e397d (patch)
treed67ad3640a256258af53c8e70a82aed88335736b
parentb43063ff55858f73cbd44fc4496b3489c8bdfba4 (diff)
downloadlinux-stable-dcb80ffe3825fb551a293491424695198b2e397d.tar.gz
linux-stable-dcb80ffe3825fb551a293491424695198b2e397d.tar.bz2
linux-stable-dcb80ffe3825fb551a293491424695198b2e397d.zip
ath9k: Fix regression with Atheros 9271
commit 92f53e2fda8bb9a559ad61d57bfb397ce67ed0ab upstream. 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 <shiftee@posteo.net> Reported-by: Roman Mamedov <rm@romanrm.net> Tested-by: Viktor Jägersküpper <viktor_jaegerskuepper@freenet.de> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200711043324.8079-1-shiftee@posteo.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/wireless/ath/ath9k/hif_usb.c4
1 files changed, 3 insertions, 1 deletions
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: