drop 4.4 network patch

diff --git a/queue-4.4/net-dsa-add-error-handling-for-pskb_trim_rcsum.patch b/queue-4.4/net-dsa-add-error-handling-for-pskb_trim_rcsum.patch
deleted file mode 100644 (file)
index 2a0a737..0000000
--- a/queue-4.4/net-dsa-add-error-handling-for-pskb_trim_rcsum.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From foo@baz Thu Jun 21 12:38:22 JST 2018
-From: Zhouyang Jia <jiazhouyang09@gmail.com>
-Date: Mon, 11 Jun 2018 13:26:35 +0800
-Subject: net: dsa: add error handling for pskb_trim_rcsum
-
-From: Zhouyang Jia <jiazhouyang09@gmail.com>
-
-[ Upstream commit 349b71d6f427ff8211adf50839dbbff3f27c1805 ]
-
-When pskb_trim_rcsum fails, the lack of error-handling code may
-cause unexpected results.
-
-This patch adds error-handling code after calling pskb_trim_rcsum.
-
-Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/dsa/tag_trailer.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/net/dsa/tag_trailer.c
-+++ b/net/dsa/tag_trailer.c
-@@ -85,7 +85,8 @@ static int trailer_rcv(struct sk_buff *s
-       if (source_port >= DSA_MAX_PORTS || ds->ports[source_port] == NULL)
-               goto out_drop;
- 
--      pskb_trim_rcsum(skb, skb->len - 4);
-+      if (pskb_trim_rcsum(skb, skb->len - 4))
-+              return NULL;
- 
-       skb->dev = ds->ports[source_port];
-       skb_push(skb, ETH_HLEN);

diff --git a/queue-4.4/series b/queue-4.4/series
index ca1e841edb981a42083d19bfe74478e00a03d4fa..08817b89ab6e1a18d8ad3c37bafff07ea8bbaa7c 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -9,5 +9,4 @@ tcp-do-not-overshoot-window_clamp-in-tcp_rcv_space_adjust.patch
 btrfs-make-raid6-rebuild-retry-more.patch
 usb-musb-fix-remote-wakeup-racing-with-suspend.patch
 bonding-re-evaluate-force_primary-when-the-primary-slave-name-changes.patch
-net-dsa-add-error-handling-for-pskb_trim_rcsum.patch
 tcp-verify-the-checksum-of-the-first-data-segment-in-a-new-connection.patch