2 files changed, 5 insertions, 4 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 8ce3f74cd6b9..ab9b8d0d115e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6402,7 +6402,7 @@ int __netdev_update_features(struct net_device *dev)
         struct net_device *upper, *lower;
         netdev_features_t features;
         struct list_head *iter;
-        int err = 0;
+        int err = -1;
 
         ASSERT_RTNL();
 
@@ -6419,7 +6419,7 @@ int __netdev_update_features(struct net_device *dev)
                 features = netdev_sync_upper_features(dev, upper, features);
 
         if (dev->features == features)
-                return 0;
+                goto sync_lower;
 
         netdev_dbg(dev, "Features changed: %pNF -> %pNF\n",
                 &dev->features, &features);
@@ -6434,6 +6434,7 @@ int __netdev_update_features(struct net_device *dev)
                 return -1;
         }
 
+sync_lower:
         /* some features must be disabled on lower devices when disabled
          * on an upper device (think: bonding master or bridge)
          */
@@ -6443,7 +6444,7 @@ int __netdev_update_features(struct net_device *dev)
         if (!err)
                 dev->features = features;
 
-        return 1;
+        return err < 0 ? 0 : 1;
 }
 
 /**
diff --git a/net/core/dst.c b/net/core/dst.c
index 2a1818065e12..e6dc77252fe9 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -306,7 +306,7 @@ void dst_release(struct dst_entry *dst)
                 if (unlikely(newrefcnt < 0))
                         net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
                                              __func__, dst, newrefcnt);
-                if (unlikely(dst->flags & DST_NOCACHE) && !newrefcnt)
+                if (!newrefcnt && unlikely(dst->flags & DST_NOCACHE))
                         call_rcu(&dst->rcu_head, dst_destroy_rcu);
         }
 }