1 files changed, 12 insertions, 12 deletions

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index cee640281e02..6cb7cff22db9 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1981,7 +1981,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
         u32             itag = 0;
         struct rtable   *rth;
         struct flowi4   fl4;
-        bool do_cache;
+        bool do_cache = true;
 
         /* IP on this device is disabled. */
 
@@ -2058,6 +2058,9 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
         if (res->type == RTN_BROADCAST) {
                 if (IN_DEV_BFORWARD(in_dev))
                         goto make_route;
+                /* not do cache if bc_forwarding is enabled */
+                if (IPV4_DEVCONF_ALL(net, BC_FORWARDING))
+                        do_cache = false;
                 goto brd_input;
         }
 
@@ -2095,18 +2098,15 @@ brd_input:
         RT_CACHE_STAT_INC(in_brd);
 
 local_input:
-        do_cache = false;
-        if (res->fi) {
-                if (!itag) {
-                        struct fib_nh_common *nhc = FIB_RES_NHC(*res);
+        do_cache &= res->fi && !itag;
+        if (do_cache) {
+                struct fib_nh_common *nhc = FIB_RES_NHC(*res);
 
-                        rth = rcu_dereference(nhc->nhc_rth_input);
-                        if (rt_cache_valid(rth)) {
-                                skb_dst_set_noref(skb, &rth->dst);
-                                err = 0;
-                                goto out;
-                        }
-                        do_cache = true;
+                rth = rcu_dereference(nhc->nhc_rth_input);
+                if (rt_cache_valid(rth)) {
+                        skb_dst_set_noref(skb, &rth->dst);
+                        err = 0;
+                        goto out;
                 }
         }