delete queue-4.4/tcp-fix-mark-propagation-with-fwmark_reflect-enabled.patch

diff --git a/queue-4.4/series b/queue-4.4/series
index 1f2a77c427e3ac0e032ace550c1d5d4e8a3a6479..950dbb95eec64f8247957bf70b2d5e4012371ac5 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1,4 +1,3 @@
-tcp-fix-mark-propagation-with-fwmark_reflect-enabled.patch
 vfs-fix-uninitialized-flags-in-splice_to_pipe.patch
 siano-make-it-work-again-with-config_vmap_stack.patch
 fuse-fix-use-after-free-issue-in-fuse_dev_do_read.patch

diff --git a/queue-4.4/tcp-fix-mark-propagation-with-fwmark_reflect-enabled.patch b/queue-4.4/tcp-fix-mark-propagation-with-fwmark_reflect-enabled.patch
deleted file mode 100644 (file)
index 1f00f04..0000000
--- a/queue-4.4/tcp-fix-mark-propagation-with-fwmark_reflect-enabled.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From bf99b4ded5f8a4767dbb9d180626f06c51f9881f Mon Sep 17 00:00:00 2001
-From: Pau Espin Pedrol <pespin.shar@gmail.com>
-Date: Fri, 6 Jan 2017 20:33:28 +0100
-Subject: tcp: fix mark propagation with fwmark_reflect enabled
-
-From: Pau Espin Pedrol <pespin.shar@gmail.com>
-
-commit bf99b4ded5f8a4767dbb9d180626f06c51f9881f upstream.
-
-Otherwise, RST packets generated by the TCP stack for non-existing
-sockets always have mark 0.
-The mark from the original packet is assigned to the netns_ipv4/6
-socket used to send the response so that it can get copied into the
-response skb when the socket sends it.
-
-Fixes: e110861f8609 ("net: add a sysctl to reflect the fwmark on replies")
-Cc: Lorenzo Colitti <lorenzo@google.com>
-Signed-off-by: Pau Espin Pedrol <pau.espin@tessares.net>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/ipv4/ip_output.c |    1 +
- net/ipv6/tcp_ipv6.c  |    1 +
- 2 files changed, 2 insertions(+)
-
---- a/net/ipv4/ip_output.c
-+++ b/net/ipv4/ip_output.c
-@@ -1592,6 +1592,7 @@ void ip_send_unicast_reply(struct sock *
-       sk->sk_protocol = ip_hdr(skb)->protocol;
-       sk->sk_bound_dev_if = arg->bound_dev_if;
-       sk->sk_sndbuf = sysctl_wmem_default;
-+      sk->sk_mark = fl4.flowi4_mark;
-       err = ip_append_data(sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base,
-                            len, 0, &ipc, &rt, MSG_DONTWAIT);
-       if (unlikely(err)) {
---- a/net/ipv6/tcp_ipv6.c
-+++ b/net/ipv6/tcp_ipv6.c
-@@ -822,6 +822,7 @@ static void tcp_v6_send_response(const s
-       dst = ip6_dst_lookup_flow(ctl_sk, &fl6, NULL);
-       if (!IS_ERR(dst)) {
-               skb_dst_set(buff, dst);
-+              ctl_sk->sk_mark = fl6.flowi6_mark;
-               ip6_xmit(ctl_sk, buff, &fl6, NULL, tclass);
-               TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);
-               if (rst)