netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Ahern <dsa@cumulusnetworks.com>
To: netdev@vger.kernel.org
Cc: nicolas.dichtel@6wind.com, David Ahern <dsa@cumulusnetworks.com>
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	[thread overview]
Message-ID: <1490736487-16020-7-git-send-email-dsa@cumulusnetworks.com> (raw)
In-Reply-To: <1490736487-16020-1-git-send-email-dsa@cumulusnetworks.com>

Refactor mpls_netconf_notify_devconf to take the event as an input arg.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
---
 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);
 		}
 	}
 
-- 
2.1.4

  parent reply	other threads:[~2017-03-28 21:28 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-28 21:28 [PATCH net-next 0/7] netconf: Add support for RTM_DELNETCONF David Ahern
2017-03-28 21:28 ` [PATCH net-next 1/7] rtnetlink: Add RTM_DELNETCONF David Ahern
2017-03-28 21:28 ` [PATCH net-next 2/7] net: devinet: Refactor inet_netconf_notify_devconf to take event David Ahern
2017-03-28 21:28 ` [PATCH net-next 3/7] net: devinet: Add support for RTM_DELNETCONF David Ahern
2017-03-28 21:28 ` [PATCH net-next 4/7] net: ipv6: Refactor inet6_netconf_notify_devconf to take event David Ahern
2017-03-28 21:28 ` [PATCH net-next 5/7] net: ipv6: Add support for RTM_DELNETCONF David Ahern
2017-03-28 21:28 ` David Ahern [this message]
2017-03-28 21:28 ` [PATCH net-next 7/7] net: mpls: Send netconf messages on device register and unregister David Ahern
2017-03-29  5:32 ` [PATCH net-next 0/7] netconf: Add support for RTM_DELNETCONF David Miller
2017-03-29  9:36   ` Nicolas Dichtel
2017-03-29 14:13     ` David Ahern
2017-03-29 14:22       ` Nicolas Dichtel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1490736487-16020-7-git-send-email-dsa@cumulusnetworks.com \
    --to=dsa@cumulusnetworks.com \
    --cc=netdev@vger.kernel.org \
    --cc=nicolas.dichtel@6wind.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).