Merge remote-tracking branches 'spi/fix/bcm63xx', 'spi/fix/doc', 'spi/fix/mediatek...

[firefly-linux-kernel-4.4.55.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 5dbc86ea6b580e851f80bcdef68da80bc64b2cd2..ae00b894e67555257b1ba81dd57cecec72eed161 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6436,7 +6436,10 @@ int __netdev_update_features(struct net_device *dev)
                netdev_err(dev,
                        "set_features() failed (%d); wanted %pNF, left %pNF\n",
                        err, &features, &dev->features);
-               return 0;
+               /* return non-0 since some features might have changed and
+                * it's better to fire a spurious notification than miss it
+                */
+               return -1;
        }
 
 sync_lower: