hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net:mpls: Refactor mpls_netconf_notify_devconf to take event 

Refactor mpls_netconf_notify_devconf to take the event as an input arg.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2017-03-28 14:28:06 -07:00 committed by David S. Miller
parent 2345217026
commit 823566aee0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/mpls/af_mpls.c
View File

@ -1040,8 +1040,8 @@ static int mpls_netconf_msgsize_devconf(int type)
return size; return size;
} }
static void mpls_netconf_notify_devconf(struct net *net, int type, static void mpls_netconf_notify_devconf(struct net *net, int event,
struct mpls_dev *mdev) int type, struct mpls_dev *mdev)
{ {
struct sk_buff *skb; struct sk_buff *skb;
int err = -ENOBUFS; int err = -ENOBUFS;
@ -1050,8 +1050,7 @@ static void mpls_netconf_notify_devconf(struct net *net, int type,
if (!skb) if (!skb)
goto errout; goto errout;
err = mpls_netconf_fill_devconf(skb, mdev, 0, 0, RTM_NEWNETCONF, err = mpls_netconf_fill_devconf(skb, mdev, 0, 0, event, 0, type);
0, type);
if (err < 0) { if (err < 0) {
/* -EMSGSIZE implies BUG in mpls_netconf_msgsize_devconf() */ /* -EMSGSIZE implies BUG in mpls_netconf_msgsize_devconf() */
WARN_ON(err == -EMSGSIZE); 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) && if (i == offsetof(struct mpls_dev, input_enabled) &&
val != oval) { val != oval) {
mpls_netconf_notify_devconf(net, mpls_netconf_notify_devconf(net, RTM_NEWNETCONF,
NETCONFA_INPUT, NETCONFA_INPUT, mdev);
mdev);
} }
} }