From c8b39e9450d723636404f7dab1606bb310925723 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 5 Aug 2013 16:41:23 +0800 Subject: [PATCH] remove atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch --- ...etdev_alloc_skb-in-refilling-rx-ring.patch | 44 ------------------- queue-3.10/series | 1 - ...etdev_alloc_skb-in-refilling-rx-ring.patch | 44 ------------------- queue-3.4/series | 1 - 4 files changed, 90 deletions(-) delete mode 100644 queue-3.10/atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch delete mode 100644 queue-3.4/atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch diff --git a/queue-3.10/atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch b/queue-3.10/atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch deleted file mode 100644 index f5f4b45604e..00000000000 --- a/queue-3.10/atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ebe7fdbaf3e90ea22feade6c9f5e50f42b23b6d8 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Fri, 26 Jul 2013 12:47:14 -0400 -Subject: atl1c: Fix misuse of netdev_alloc_skb in refilling rx ring - -From: Neil Horman - -commit ebe7fdbaf3e90ea22feade6c9f5e50f42b23b6d8 upstream. - -atl1c uses netdev_alloc_skb to refill its rx dma ring, but that call makes no -guarantees about the suitability of the memory for use in DMA. As a result -we've gotten reports of atl1c drivers occasionally hanging and needing to be -reset: -https://bugzilla.kernel.org/show_bug.cgi?id=54021 - -Fix this by modifying the call to use the internal version __netdev_alloc_skb, -where you can set the gfp_mask explicitly to include GFP_DMA. - -Tested by two reporters in the above bug, who have the hardware to validate it. -Both report immediate cessation of the problem with this patch - -Signed-off-by: Neil Horman -CC: Jay Cliburn -CC: "David S. Miller" -Tested-by: Luis Henriques -Tested-by: Vincent Alquier -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -1660,7 +1660,7 @@ static int atl1c_alloc_rx_buffer(struct - while (next_info->flags & ATL1C_BUFFER_FREE) { - rfd_desc = ATL1C_RFD_DESC(rfd_ring, rfd_next_to_use); - -- skb = netdev_alloc_skb(adapter->netdev, adapter->rx_buffer_len); -+ skb = __netdev_alloc_skb(adapter->netdev, adapter->rx_buffer_len, GFP_ATOMIC|GFP_DMA); - if (unlikely(!skb)) { - if (netif_msg_rx_err(adapter)) - dev_warn(&pdev->dev, "alloc rx buffer failed\n"); diff --git a/queue-3.10/series b/queue-3.10/series index c102e7af1c4..538aa95ee26 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -33,7 +33,6 @@ iwlwifi-mvm-refuse-connection-to-aps-with-bi-16.patch iwlwifi-add-dell-sku-for-5150-hmc.patch iwlwifi-mvm-fix-flushing-not-started-aggregation-sessions.patch iwlwifi-pcie-clear-rfkill-interrupt-in-ampg.patch -atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch ath9k_htc-do-some-initial-hardware-configuration.patch ath9k_htc-reboot-firmware-if-it-was-loaded.patch nl80211-fix-mgmt-tx-status-and-testmode-reporting-for-netns.patch diff --git a/queue-3.4/atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch b/queue-3.4/atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch deleted file mode 100644 index 70a8e13397e..00000000000 --- a/queue-3.4/atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ebe7fdbaf3e90ea22feade6c9f5e50f42b23b6d8 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Fri, 26 Jul 2013 12:47:14 -0400 -Subject: atl1c: Fix misuse of netdev_alloc_skb in refilling rx ring - -From: Neil Horman - -commit ebe7fdbaf3e90ea22feade6c9f5e50f42b23b6d8 upstream. - -atl1c uses netdev_alloc_skb to refill its rx dma ring, but that call makes no -guarantees about the suitability of the memory for use in DMA. As a result -we've gotten reports of atl1c drivers occasionally hanging and needing to be -reset: -https://bugzilla.kernel.org/show_bug.cgi?id=54021 - -Fix this by modifying the call to use the internal version __netdev_alloc_skb, -where you can set the gfp_mask explicitly to include GFP_DMA. - -Tested by two reporters in the above bug, who have the hardware to validate it. -Both report immediate cessation of the problem with this patch - -Signed-off-by: Neil Horman -CC: Jay Cliburn -CC: "David S. Miller" -Tested-by: Luis Henriques -Tested-by: Vincent Alquier -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -1765,7 +1765,7 @@ static int atl1c_alloc_rx_buffer(struct - while (next_info->flags & ATL1C_BUFFER_FREE) { - rfd_desc = ATL1C_RFD_DESC(rfd_ring, rfd_next_to_use); - -- skb = netdev_alloc_skb(adapter->netdev, adapter->rx_buffer_len); -+ skb = __netdev_alloc_skb(adapter->netdev, adapter->rx_buffer_len, GFP_ATOMIC|GFP_DMA); - if (unlikely(!skb)) { - if (netif_msg_rx_err(adapter)) - dev_warn(&pdev->dev, "alloc rx buffer failed\n"); diff --git a/queue-3.4/series b/queue-3.4/series index 21dc75f461b..1ac1c8fbf6b 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -2,7 +2,6 @@ alsa-compress-fix-the-return-value-for-sndrv_compress_version.patch serial-mxs-auart-fix-race-condition-in-interrupt-handler.patch serial-mxs-auart-increase-time-to-wait-for-transmitter-to-become-idle.patch dma-pl330-fix-cyclic-transfers.patch -atl1c-fix-misuse-of-netdev_alloc_skb-in-refilling-rx-ring.patch ath9k_htc-do-some-initial-hardware-configuration.patch nl80211-fix-mgmt-tx-status-and-testmode-reporting-for-netns.patch mac80211-fix-duplicate-retransmission-detection.patch -- 2.47.3