diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 23:20:57 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 23:20:57 -0400 |
| commit | 6f2dcddaeb1d1ba0835744a5d091f079ba0bcce3 (patch) | |
| tree | 7287b749acde081f9eedd7078e1d80d6a794e491 | |
| parent | 33c8996053fef49d945dedf1644e65f541288634 (diff) | |
| download | longterm-queue-4.12-6f2dcddaeb1d1ba0835744a5d091f079ba0bcce3.tar.gz | |
net: another refresh route patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/route-update-fnhe_expires-for-redirect-when-the-fnhe.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/queue/route-update-fnhe_expires-for-redirect-when-the-fnhe.patch b/queue/route-update-fnhe_expires-for-redirect-when-the-fnhe.patch index b3e9529..65f9411 100644 --- a/queue/route-update-fnhe_expires-for-redirect-when-the-fnhe.patch +++ b/queue/route-update-fnhe_expires-for-redirect-when-the-fnhe.patch @@ -1,4 +1,4 @@ -From e39d5246111399dbc6e11cd39fd8580191b86c47 Mon Sep 17 00:00:00 2001 +From 68fa5e7b2edeada1bcc1910c4e6a691072baef5f Mon Sep 17 00:00:00 2001 From: Xin Long <lucien.xin@gmail.com> Date: Fri, 17 Nov 2017 14:27:06 +0800 Subject: [PATCH] route: update fnhe_expires for redirect when the fnhe exists @@ -24,13 +24,14 @@ Reported-by: Jianlin Shi <jishi@redhat.com> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/route.c b/net/ipv4/route.c -index 3b427757b1f8..11cf2fe43308 100644 +index bab181b5a21f..1dfe08765a6b 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -678,10 +678,9 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw, - if (fnhe) { +@@ -684,10 +684,9 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw, + fnhe->fnhe_genid = genid; if (gw) fnhe->fnhe_gw = gw; - if (pmtu) { |