summaryrefslogtreecommitdiff
path: root/libre/linux-libre-lts/0002-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/linux-libre-lts/0002-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch')
-rw-r--r--libre/linux-libre-lts/0002-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch254
1 files changed, 0 insertions, 254 deletions
diff --git a/libre/linux-libre-lts/0002-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch b/libre/linux-libre-lts/0002-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch
deleted file mode 100644
index 8d355eb48..000000000
--- a/libre/linux-libre-lts/0002-Revert-ath9k-Fix-general-protection-fault-in-ath9k_h.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Viktor=20J=C3=A4gersk=C3=BCpper?=
- <viktor_jaegerskuepper@freenet.de>
-Date: Wed, 1 Jul 2020 23:32:28 +0200
-Subject: [PATCH] Revert "ath9k: Fix general protection fault in
- ath9k_hif_usb_rx_cb"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 2bbcaaee1fcb ("ath9k: Fix general protection fault
-in ath9k_hif_usb_rx_cb") because the driver gets stuck like this:
-
- [ 5.778803] usb 1-5: Manufacturer: ATHEROS
- [ 21.697488] usb 1-5: ath9k_htc: Firmware ath9k_htc/htc_9271-1.4.0.fw requested
- [ 21.701377] usbcore: registered new interface driver ath9k_htc
- [ 22.053705] usb 1-5: ath9k_htc: Transferred FW: ath9k_htc/htc_9271-1.4.0.fw, size: 51008
- [ 22.306182] ath9k_htc 1-5:1.0: ath9k_htc: HTC initialized with 33 credits
- [ 115.708513] ath9k_htc: Failed to initialize the device
- [ 115.708683] usb 1-5: ath9k_htc: USB layer deinitialized
-
-Reported-by: Roman Mamedov <rm@romanrm.net>
-Ref: https://bugzilla.kernel.org/show_bug.cgi?id=208251
-Fixes: 2bbcaaee1fcb ("ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb")
-Tested-by: Viktor Jägersküpper <viktor_jaegerskuepper@freenet.de>
-Signed-off-by: Viktor Jägersküpper <viktor_jaegerskuepper@freenet.de>
----
- drivers/net/wireless/ath/ath9k/hif_usb.c | 48 ++++++------------------
- drivers/net/wireless/ath/ath9k/hif_usb.h | 5 ---
- 2 files changed, 11 insertions(+), 42 deletions(-)
-
-diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
-index 4ed21dad6a8e..6049d3766c64 100644
---- a/drivers/net/wireless/ath/ath9k/hif_usb.c
-+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
-@@ -643,9 +643,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
-
- static void ath9k_hif_usb_rx_cb(struct urb *urb)
- {
-- struct rx_buf *rx_buf = (struct rx_buf *)urb->context;
-- struct hif_device_usb *hif_dev = rx_buf->hif_dev;
-- struct sk_buff *skb = rx_buf->skb;
-+ struct sk_buff *skb = (struct sk_buff *) urb->context;
-+ struct hif_device_usb *hif_dev =
-+ usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
- int ret;
-
- if (!skb)
-@@ -685,15 +685,14 @@ static void ath9k_hif_usb_rx_cb(struct urb *urb)
- return;
- free:
- kfree_skb(skb);
-- kfree(rx_buf);
- }
-
- static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
- {
-- struct rx_buf *rx_buf = (struct rx_buf *)urb->context;
-- struct hif_device_usb *hif_dev = rx_buf->hif_dev;
-- struct sk_buff *skb = rx_buf->skb;
-+ struct sk_buff *skb = (struct sk_buff *) urb->context;
- struct sk_buff *nskb;
-+ struct hif_device_usb *hif_dev =
-+ usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
- int ret;
-
- if (!skb)
-@@ -751,7 +750,6 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
- return;
- free:
- kfree_skb(skb);
-- kfree(rx_buf);
- urb->context = NULL;
- }
-
-@@ -797,7 +795,7 @@ static int ath9k_hif_usb_alloc_tx_urbs(struct hif_device_usb *hif_dev)
- init_usb_anchor(&hif_dev->mgmt_submitted);
-
- for (i = 0; i < MAX_TX_URB_NUM; i++) {
-- tx_buf = kzalloc(sizeof(*tx_buf), GFP_KERNEL);
-+ tx_buf = kzalloc(sizeof(struct tx_buf), GFP_KERNEL);
- if (!tx_buf)
- goto err;
-
-@@ -834,146 +832,122 @@ static void ath9k_hif_usb_dealloc_rx_urbs(struct hif_device_usb *hif_dev)
-
- static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
- {
-- struct rx_buf *rx_buf = NULL;
-- struct sk_buff *skb = NULL;
- struct urb *urb = NULL;
-+ struct sk_buff *skb = NULL;
- int i, ret;
-
- init_usb_anchor(&hif_dev->rx_submitted);
- spin_lock_init(&hif_dev->rx_lock);
-
- for (i = 0; i < MAX_RX_URB_NUM; i++) {
-
-- rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL);
-- if (!rx_buf) {
-- ret = -ENOMEM;
-- goto err_rxb;
-- }
--
- /* Allocate URB */
- urb = usb_alloc_urb(0, GFP_KERNEL);
- if (urb == NULL) {
- ret = -ENOMEM;
- goto err_urb;
- }
-
- /* Allocate buffer */
- skb = alloc_skb(MAX_RX_BUF_SIZE, GFP_KERNEL);
- if (!skb) {
- ret = -ENOMEM;
- goto err_skb;
- }
-
-- rx_buf->hif_dev = hif_dev;
-- rx_buf->skb = skb;
--
- usb_fill_bulk_urb(urb, hif_dev->udev,
- usb_rcvbulkpipe(hif_dev->udev,
- USB_WLAN_RX_PIPE),
- skb->data, MAX_RX_BUF_SIZE,
-- ath9k_hif_usb_rx_cb, rx_buf);
-+ ath9k_hif_usb_rx_cb, skb);
-
- /* Anchor URB */
- usb_anchor_urb(urb, &hif_dev->rx_submitted);
-
- /* Submit URB */
- ret = usb_submit_urb(urb, GFP_KERNEL);
- if (ret) {
- usb_unanchor_urb(urb);
- goto err_submit;
- }
-
- /*
- * Drop reference count.
- * This ensures that the URB is freed when killing them.
- */
- usb_free_urb(urb);
- }
-
- return 0;
-
- err_submit:
- kfree_skb(skb);
- err_skb:
- usb_free_urb(urb);
- err_urb:
-- kfree(rx_buf);
--err_rxb:
- ath9k_hif_usb_dealloc_rx_urbs(hif_dev);
- return ret;
- }
-
- static void ath9k_hif_usb_dealloc_reg_in_urbs(struct hif_device_usb *hif_dev)
- {
- usb_kill_anchored_urbs(&hif_dev->reg_in_submitted);
- }
-
- static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev)
- {
-- struct rx_buf *rx_buf = NULL;
-- struct sk_buff *skb = NULL;
- struct urb *urb = NULL;
-+ struct sk_buff *skb = NULL;
- int i, ret;
-
- init_usb_anchor(&hif_dev->reg_in_submitted);
-
- for (i = 0; i < MAX_REG_IN_URB_NUM; i++) {
-
-- rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL);
-- if (!rx_buf) {
-- ret = -ENOMEM;
-- goto err_rxb;
-- }
--
- /* Allocate URB */
- urb = usb_alloc_urb(0, GFP_KERNEL);
- if (urb == NULL) {
- ret = -ENOMEM;
- goto err_urb;
- }
-
- /* Allocate buffer */
- skb = alloc_skb(MAX_REG_IN_BUF_SIZE, GFP_KERNEL);
- if (!skb) {
- ret = -ENOMEM;
- goto err_skb;
- }
-
-- rx_buf->hif_dev = hif_dev;
-- rx_buf->skb = skb;
--
- usb_fill_int_urb(urb, hif_dev->udev,
- usb_rcvintpipe(hif_dev->udev,
- USB_REG_IN_PIPE),
- skb->data, MAX_REG_IN_BUF_SIZE,
-- ath9k_hif_usb_reg_in_cb, rx_buf, 1);
-+ ath9k_hif_usb_reg_in_cb, skb, 1);
-
- /* Anchor URB */
- usb_anchor_urb(urb, &hif_dev->reg_in_submitted);
-
- /* Submit URB */
- ret = usb_submit_urb(urb, GFP_KERNEL);
- if (ret) {
- usb_unanchor_urb(urb);
- goto err_submit;
- }
-
- /*
- * Drop reference count.
- * This ensures that the URB is freed when killing them.
- */
- usb_free_urb(urb);
- }
-
- return 0;
-
- err_submit:
- kfree_skb(skb);
- err_skb:
- usb_free_urb(urb);
- err_urb:
-- kfree(rx_buf);
--err_rxb:
- ath9k_hif_usb_dealloc_reg_in_urbs(hif_dev);
- return ret;
- }
-diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h
-index 5985aa15ca93..a94e7e1c86e9 100644
---- a/drivers/net/wireless/ath/ath9k/hif_usb.h
-+++ b/drivers/net/wireless/ath/ath9k/hif_usb.h
-@@ -86,11 +86,6 @@ struct tx_buf {
- struct list_head list;
- };
-
--struct rx_buf {
-- struct sk_buff *skb;
-- struct hif_device_usb *hif_dev;
--};
--
- #define HIF_USB_TX_STOP BIT(0)
- #define HIF_USB_TX_FLUSH BIT(1)
-
---
-2.27.0
-