diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 23:19:54 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 23:19:54 -0400 |
| commit | 33c8996053fef49d945dedf1644e65f541288634 (patch) | |
| tree | 04356d41f617150ab3949304a7462153668ac84b | |
| parent | cd009a75d7bbf07abc2723c007803e8e883014c2 (diff) | |
| download | longterm-queue-4.12-33c8996053fef49d945dedf1644e65f541288634.tar.gz | |
net: refresh route patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/route-also-update-fnhe_genid-when-updating-a-route-c.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/queue/route-also-update-fnhe_genid-when-updating-a-route-c.patch b/queue/route-also-update-fnhe_genid-when-updating-a-route-c.patch index eba2680..ab0c332 100644 --- a/queue/route-also-update-fnhe_genid-when-updating-a-route-c.patch +++ b/queue/route-also-update-fnhe_genid-when-updating-a-route-c.patch @@ -1,4 +1,4 @@ -From cebe84c6190d741045a322f5343f717139993c08 Mon Sep 17 00:00:00 2001 +From 714a383c99b80b9fe561e15eb07b58274341add6 Mon Sep 17 00:00:00 2001 From: Xin Long <lucien.xin@gmail.com> Date: Fri, 17 Nov 2017 14:27:18 +0800 Subject: [PATCH] route: also update fnhe_genid when updating a route cache @@ -19,12 +19,13 @@ Fixes: 5aad1de5ea2c ("ipv4: use separate genid for next hop exceptions") 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 11cf2fe43308..43b69af242e1 100644 +index 04a75f2efe2b..bab181b5a21f 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -651,9 +651,12 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw, +@@ -652,9 +652,12 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw, struct fnhe_hash_bucket *hash; struct fib_nh_exception *fnhe; struct rtable *rt; @@ -38,7 +39,7 @@ index 11cf2fe43308..43b69af242e1 100644 spin_lock_bh(&fnhe_lock); -@@ -676,6 +679,8 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw, +@@ -677,6 +680,8 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw, } if (fnhe) { @@ -46,8 +47,8 @@ index 11cf2fe43308..43b69af242e1 100644 + fnhe->fnhe_genid = genid; if (gw) fnhe->fnhe_gw = gw; - if (pmtu) -@@ -699,7 +704,7 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw, + if (pmtu) { +@@ -701,7 +706,7 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw, fnhe->fnhe_next = hash->chain; rcu_assign_pointer(hash->chain, fnhe); } |