drop 4.9 patch

diff --git a/queue-4.9/nfp-don-t-tell-fw-about-the-reserved-buffer-space.patch b/queue-4.9/nfp-don-t-tell-fw-about-the-reserved-buffer-space.patch
deleted file mode 100644 (file)
index 8d32716..0000000
--- a/queue-4.9/nfp-don-t-tell-fw-about-the-reserved-buffer-space.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9383b33771e566fa547daa2d09c6e0f1aaa298c3 Mon Sep 17 00:00:00 2001
-From: Jakub Kicinski <jakub.kicinski@netronome.com>
-Date: Thu, 2 Mar 2017 15:26:20 -0800
-Subject: nfp: don't tell FW about the reserved buffer space
-
-From: Jakub Kicinski <jakub.kicinski@netronome.com>
-
-commit 9383b33771e566fa547daa2d09c6e0f1aaa298c3 upstream.
-
-Since commit c0f031bc8866 ("nfp_net: use alloc_frag() and build_skb()")
-we are allocating buffers which have to hold both the data and skb to
-be created in place by build_skb().
-
-FW should only be told about the buffer space it can DMA to, that
-is without the build_skb() headroom and tailroom.  Note: firmware
-applications should validate the buffers against both MTU and
-free list buffer size so oversized packets would not pass through
-the NIC anyway.
-
-Fixes: c0f031bc8866 ("nfp: use alloc_frag() and build_skb()")
-Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/ethernet/netronome/nfp/nfp_net_common.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
-+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
-@@ -2000,7 +2000,8 @@ static int __nfp_net_set_config_and_enab
-       nfp_net_write_mac_addr(nn);
- 
-       nn_writel(nn, NFP_NET_CFG_MTU, nn->netdev->mtu);
--      nn_writel(nn, NFP_NET_CFG_FLBUFSZ, nn->fl_bufsz);
-+      nn_writel(nn, NFP_NET_CFG_FLBUFSZ,
-+                nn->fl_bufsz - NFP_NET_RX_BUF_NON_DATA);
- 
-       /* Enable device */
-       new_ctrl |= NFP_NET_CFG_CTRL_ENABLE;

diff --git a/queue-4.9/series b/queue-4.9/series
index d6974c98528ace2d66c585746ffd1f7d3823589d..29dad0e4dcd87b568e4826ee7466ad36af8afb90 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -98,5 +98,4 @@ alsa-hda-realtek-fix-pop-noise-on-lenovo-p50-co.patch
 alsa-hda-realtek-add-a-quirk-for-fsc-esprimo-u9210.patch
 block-fix-transfer-when-chunk-sectors-exceeds-max.patch
 dm-thin-handle-running-out-of-data-space-vs-concurrent-discard.patch
-nfp-don-t-tell-fw-about-the-reserved-buffer-space.patch
 cdc_ncm-avoid-padding-beyond-end-of-skb.patch