From patchwork Tue Mar 28 21:28:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 744539 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vt3t90HB6z9s2Q for ; Wed, 29 Mar 2017 08:28:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="JuX0Hv8C"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932597AbdC1V2s (ORCPT ); Tue, 28 Mar 2017 17:28:48 -0400 Received: from mail-it0-f52.google.com ([209.85.214.52]:35993 "EHLO mail-it0-f52.google.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753422AbdC1V2q (ORCPT ); Tue, 28 Mar 2017 17:28:46 -0400 Received: by mail-it0-f52.google.com with SMTP id e75so71440758itd.1 for ; Tue, 28 Mar 2017 14:28:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B3P0iE9hpfwd9t3aMNcfdQYRANY6bXVjHCXX83ahDBI=; b=JuX0Hv8C4l6ojf7VHgxa2uyHbhkQRxzRGZStmgZtwlsOToH28iWUb3BNSDfgyJTw8O c9dEz9RCm6xW1obTFe/zXfRh3+LfHP0gCuIrePT+C6Qpt4ytd44H451qSgZouBhbD0AK iAG8x58AR+Ix9ZjZhn4uwq6VhQ83WsvsFnYAQ= 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:in-reply-to :references; bh=B3P0iE9hpfwd9t3aMNcfdQYRANY6bXVjHCXX83ahDBI=; b=h6tH7mA3LszNN/4cKr2Q25IwQTu8zSmpk0KOND2briZhYGfHQRQrybOKl3XzxG/M5F /gdjevwwA6PdKZyaa7f5otN0OG7nJYmTeAHXmfHDatzlQoS4wC4r+gjy1rxPcsU+LKoR RnWt0fqT4bUZ5nun/bAmOVCxjDC4qW57psNtodOnZJkhTMbYMSJSq8AehJtlJCZ3RDNk nc/Lh8Z7PSF+5b6vJnHbDh4/I77X7jYRWX76WPEjE+TmvUOm1pXhp99I7KwVYio0sAmb kFe0rdyuPQipMISKtCdnpxmQg3JG/GhuA8eLh3GBAzUXkIwWMct/KtI3NAqn8pPA/Ms0 8RQA== X-Gm-Message-State: AFeK/H0UWjxGdQUUJ0sELPtGxYCneVyIMVEk+aBSShZUkOBqblWuswqcF/vLzJ00mv95v21G X-Received: by 10.36.80.85 with SMTP id m82mr19014421itb.23.1490736497369; Tue, 28 Mar 2017 14:28:17 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id k186sm2123144ita.30.2017.03.28.14.28.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Mar 2017 14:28:16 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: nicolas.dichtel@6wind.com, David Ahern Subject: [PATCH net-next 6/7] net:mpls: Refactor mpls_netconf_notify_devconf to take event Date: Tue, 28 Mar 2017 14:28:06 -0700 Message-Id: <1490736487-16020-7-git-send-email-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1490736487-16020-1-git-send-email-dsa@cumulusnetworks.com> References: <1490736487-16020-1-git-send-email-dsa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Refactor mpls_netconf_notify_devconf to take the event as an input arg. Signed-off-by: David Ahern --- net/mpls/af_mpls.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 74755920c689..313cd0a93a63 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -1040,8 +1040,8 @@ static int mpls_netconf_msgsize_devconf(int type) return size; } -static void mpls_netconf_notify_devconf(struct net *net, int type, - struct mpls_dev *mdev) +static void mpls_netconf_notify_devconf(struct net *net, int event, + int type, struct mpls_dev *mdev) { struct sk_buff *skb; int err = -ENOBUFS; @@ -1050,8 +1050,7 @@ static void mpls_netconf_notify_devconf(struct net *net, int type, if (!skb) goto errout; - err = mpls_netconf_fill_devconf(skb, mdev, 0, 0, RTM_NEWNETCONF, - 0, type); + err = mpls_netconf_fill_devconf(skb, mdev, 0, 0, event, 0, type); if (err < 0) { /* -EMSGSIZE implies BUG in mpls_netconf_msgsize_devconf() */ WARN_ON(err == -EMSGSIZE); @@ -1184,9 +1183,8 @@ static int mpls_conf_proc(struct ctl_table *ctl, int write, if (i == offsetof(struct mpls_dev, input_enabled) && val != oval) { - mpls_netconf_notify_devconf(net, - NETCONFA_INPUT, - mdev); + mpls_netconf_notify_devconf(net, RTM_NEWNETCONF, + NETCONFA_INPUT, mdev); } }