From patchwork Tue Jan 1 06:42:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Krishna Policharla X-Patchwork-Id: 1019750 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=broadcom.com header.i=@broadcom.com header.b="GkUvtjES"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43TPlX0znYz9sBn for ; Tue, 1 Jan 2019 17:43:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728243AbfAAGnY (ORCPT ); Tue, 1 Jan 2019 01:43:24 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:33165 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728205AbfAAGnY (ORCPT ); Tue, 1 Jan 2019 01:43:24 -0500 Received: by mail-pf1-f195.google.com with SMTP id c123so13882310pfb.0 for ; Mon, 31 Dec 2018 22:43:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=AMznWe95QdV1GP0WW3Yl0Y7+cEK5agGrzdLNNRyeYp4=; b=GkUvtjESp2w9iiVtvyItRv1eAiW/eMLagweLYWINxEPKHooNhxVo/ViGJq7koLyrvk Ms4f+dIA6NTcqjEo4SqnKXxHjJmcSljGxuWhkEePTsI1rB/WcVx8xpaNffTIJyNK0xZ6 MOTsTJkgP316q2Chq57+2Q8/UxgF0DkyygtVc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AMznWe95QdV1GP0WW3Yl0Y7+cEK5agGrzdLNNRyeYp4=; b=KR+ajqjOZW2jutonoPN8fPeO8YADRF0xmR1joVkmTyxt2VcrYhrQRsaWZCw1IDZA9o hQ20k/v3Ozy/d9pA8XwmDYXfrqwH3TpVKjFOumF1B2ldfPgJFulx62yUtK5m7+VzDFCX jJ0ExqPEZVqp9XRwiarzTj93X4zm2ufrD/Ng2yq9g63QNMwvLsdP3FvqMjONps9FDu15 KoQrsBSYvQhrPzwOMOvGf/IK0xuYZMzkCPD7zGKgg8xCHis8WIfGO9yrtuHvPhLlrHIw QxM56LWZEWO7Cm5oPKVCwWvT8uaz47YIhJ3dBTqI1pnmE/Kp1YFRTbcVEyXUqm11Xt7I 2+Qg== X-Gm-Message-State: AA+aEWa0mcekJDmoDWPukwXtH5V4Y5a9zbraGiZ4uC5vL3LzKtgWd34j g7Iy9014du+4zYdQfcm+9AA60g== X-Google-Smtp-Source: AFSGD/XZVVW5URYoXIlECez3E1P/TBPTPzk6LFf9fbThvI2qkNdnR9ylGr0Ki6o6rw3E3FlrXjMXaQ== X-Received: by 2002:a62:2082:: with SMTP id m2mr39667108pfj.163.1546325003568; Mon, 31 Dec 2018 22:43:23 -0800 (PST) Received: from cpxswub.broadcom.com ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id s9sm67327266pgl.88.2018.12.31.22.43.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 31 Dec 2018 22:43:22 -0800 (PST) From: Murali Krishna Policharla To: davem@davemloft.net, amritha.nambiar@intel.com, ecree@solarflare.com, ktkhai@virtuozzo.com, alexander.h.duyck@intel.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Murali Krishna Policharla Subject: [PATCH] net: core: Fix to store new mtu setting in netdevice. Date: Tue, 1 Jan 2019 12:12:14 +0530 Message-Id: <1546324934-17555-1-git-send-email-murali.policharla@broadcom.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Store newly configured mtu settings in the netdevice after mtu configuration is successful to the dsa switch. Fixes: 2315dc91a5 ("net: make dev_set_mtu() honor notification return code") Signed-off-by: Murali Krishna Policharla Reviewed-by: Florian Fainelli --- net/core/dev.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 722d50d..58617aa 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -7586,12 +7586,15 @@ int dev_change_flags(struct net_device *dev, unsigned int flags) int __dev_set_mtu(struct net_device *dev, int new_mtu) { const struct net_device_ops *ops = dev->netdev_ops; + int ret = 0; if (ops->ndo_change_mtu) - return ops->ndo_change_mtu(dev, new_mtu); + ret = ops->ndo_change_mtu(dev, new_mtu); - dev->mtu = new_mtu; - return 0; + if (ret >= 0) + dev->mtu = new_mtu; + + return ret; } EXPORT_SYMBOL(__dev_set_mtu);