drop broken 3.18 patch

diff --git a/queue-3.18/ip_tunnel-don-t-force-df-when-mtu-is-locked.patch b/queue-3.18/ip_tunnel-don-t-force-df-when-mtu-is-locked.patch
deleted file mode 100644 (file)
index f114709..0000000
--- a/queue-3.18/ip_tunnel-don-t-force-df-when-mtu-is-locked.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From foo@baz Thu Nov 22 08:21:34 CET 2018
-From: Sabrina Dubroca <sd@queasysnail.net>
-Date: Fri, 16 Nov 2018 16:58:19 +0100
-Subject: ip_tunnel: don't force DF when MTU is locked
-
-From: Sabrina Dubroca <sd@queasysnail.net>
-
-[ Upstream commit 16f7eb2b77b55da816c4e207f3f9440a8cafc00a ]
-
-The various types of tunnels running over IPv4 can ask to set the DF
-bit to do PMTU discovery. However, PMTU discovery is subject to the
-threshold set by the net.ipv4.route.min_pmtu sysctl, and is also
-disabled on routes with "mtu lock". In those cases, we shouldn't set
-the DF bit.
-
-This patch makes setting the DF bit conditional on the route's MTU
-locking state.
-
-This issue seems to be older than git history.
-
-Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
-Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/ipv4/ip_tunnel_core.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/ipv4/ip_tunnel_core.c
-+++ b/net/ipv4/ip_tunnel_core.c
-@@ -68,7 +68,7 @@ int iptunnel_xmit(struct sock *sk, struc
- 
-       iph->version    =       4;
-       iph->ihl        =       sizeof(struct iphdr) >> 2;
--      iph->frag_off   =       df;
-+      iph->frag_off   =       ip_mtu_locked(&rt->dst) ? 0 : df;
-       iph->protocol   =       proto;
-       iph->tos        =       tos;
-       iph->daddr      =       dst;

diff --git a/queue-3.18/series b/queue-3.18/series
index 51f4aa52ec29254b85c4741cee185deb90cf1326..872bf15228156801383ef9654507a4c272e1340c 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -1,2 +1 @@
-ip_tunnel-don-t-force-df-when-mtu-is-locked.patch
 net-gro-reset-skb-pkt_type-in-napi_reuse_skb.patch