Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932861AbcJLMuc (ORCPT ); Wed, 12 Oct 2016 08:50:32 -0400 Received: from mail.kernel.org ([198.145.29.136]:49410 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755301AbcJLMqm (ORCPT ); Wed, 12 Oct 2016 08:46:42 -0400 From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nikolay Aleksandrov , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , "David S. Miller" , Zefan Li Subject: [PATCH 3.4 035/125] net: fix __netdev_update_features return on ndo_set_features failure Date: Wed, 12 Oct 2016 20:32:31 +0800 Message-Id: <1476275641-4697-35-git-send-email-lizf@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476275600-4626-1-git-send-email-lizf@kernel.org> References: <1476275600-4626-1-git-send-email-lizf@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1262 Lines: 39 From: Nikolay Aleksandrov 3.4.113-rc1 review patch. If anyone has any objections, please let me know. ------------------ commit 00ee5927177792a6e139d50b6b7564d35705556a upstream. If ndo_set_features fails __netdev_update_features() will return -1 but this is wrong because it is expected to return 0 if no features were changed (see netdev_update_features()), which will cause a netdev notifier to be called without any actual changes. Fix this by returning 0 if ndo_set_features fails. Fixes: 6cb6a27c45ce ("net: Call netdev_features_change() from netdev_update_features()") CC: Michał Mirosław Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller Signed-off-by: Zefan Li --- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c index 4f679bf..1f57ab1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5368,7 +5368,7 @@ 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 -1; + return 0; } if (!err) -- 1.9.1