xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: devinet: Refactor inet_netconf_notify_devconf to take event

Browse Source 
Refactor inet_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:02 -07:00
committed by David S. Miller
parent 983701eb06
commit 3b0228656d
3 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/inetdevice.h
View File

@@ -153,8 +153,8 @@ struct in_ifaddr {
int register_inetaddr_notifier(struct notifier_block *nb); int register_inetaddr_notifier(struct notifier_block *nb);
int unregister_inetaddr_notifier(struct notifier_block *nb); int unregister_inetaddr_notifier(struct notifier_block *nb);
void inet_netconf_notify_devconf(struct net *net, int type, int ifindex, void inet_netconf_notify_devconf(struct net *net, int event, int type,
struct ipv4_devconf *devconf); int ifindex, struct ipv4_devconf *devconf);
struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref); struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref);
static inline struct net_device *ip_dev_find(struct net *net, __be32 addr) static inline struct net_device *ip_dev_find(struct net *net, __be32 addr)

32
net/ipv4/devinet.c
View File

@@ -1831,8 +1831,8 @@ nla_put_failure:
return -EMSGSIZE; return -EMSGSIZE;
} }
void inet_netconf_notify_devconf(struct net *net, int type, int ifindex, void inet_netconf_notify_devconf(struct net *net, int event, int type,
struct ipv4_devconf *devconf) int ifindex, struct ipv4_devconf *devconf)
{ {
struct sk_buff *skb; struct sk_buff *skb;
int err = -ENOBUFS; int err = -ENOBUFS;
@@ -1842,7 +1842,7 @@ void inet_netconf_notify_devconf(struct net *net, int type, int ifindex,
goto errout; goto errout;
err = inet_netconf_fill_devconf(skb, ifindex, devconf, 0, 0, err = inet_netconf_fill_devconf(skb, ifindex, devconf, 0, 0,
RTM_NEWNETCONF, 0, type); event, 0, type);
if (err < 0) { if (err < 0) {
/* -EMSGSIZE implies BUG in inet_netconf_msgsize_devconf() */ /* -EMSGSIZE implies BUG in inet_netconf_msgsize_devconf() */
WARN_ON(err == -EMSGSIZE); WARN_ON(err == -EMSGSIZE);
@@ -2021,10 +2021,12 @@ static void inet_forward_change(struct net *net)
IPV4_DEVCONF_ALL(net, ACCEPT_REDIRECTS) = !on; IPV4_DEVCONF_ALL(net, ACCEPT_REDIRECTS) = !on;
IPV4_DEVCONF_DFLT(net, FORWARDING) = on; IPV4_DEVCONF_DFLT(net, FORWARDING) = on;
inet_netconf_notify_devconf(net, NETCONFA_FORWARDING, inet_netconf_notify_devconf(net, RTM_NEWNETCONF,
NETCONFA_FORWARDING,
NETCONFA_IFINDEX_ALL, NETCONFA_IFINDEX_ALL,
net->ipv4.devconf_all); net->ipv4.devconf_all);
inet_netconf_notify_devconf(net, NETCONFA_FORWARDING, inet_netconf_notify_devconf(net, RTM_NEWNETCONF,
NETCONFA_FORWARDING,
NETCONFA_IFINDEX_DEFAULT, NETCONFA_IFINDEX_DEFAULT,
net->ipv4.devconf_dflt); net->ipv4.devconf_dflt);
@@ -2037,7 +2039,8 @@ static void inet_forward_change(struct net *net)
in_dev = __in_dev_get_rtnl(dev); in_dev = __in_dev_get_rtnl(dev);
if (in_dev) { if (in_dev) {
IN_DEV_CONF_SET(in_dev, FORWARDING, on); IN_DEV_CONF_SET(in_dev, FORWARDING, on);
inet_netconf_notify_devconf(net, NETCONFA_FORWARDING, inet_netconf_notify_devconf(net, RTM_NEWNETCONF,
NETCONFA_FORWARDING,
dev->ifindex, &in_dev->cnf); dev->ifindex, &in_dev->cnf);
} }
} }
@@ -2082,19 +2085,22 @@ static int devinet_conf_proc(struct ctl_table *ctl, int write,
if (i == IPV4_DEVCONF_RP_FILTER - 1 && if (i == IPV4_DEVCONF_RP_FILTER - 1 &&
new_value != old_value) { new_value != old_value) {
ifindex = devinet_conf_ifindex(net, cnf); ifindex = devinet_conf_ifindex(net, cnf);
inet_netconf_notify_devconf(net, NETCONFA_RP_FILTER, inet_netconf_notify_devconf(net, RTM_NEWNETCONF,
NETCONFA_RP_FILTER,
ifindex, cnf); ifindex, cnf);
} }
if (i == IPV4_DEVCONF_PROXY_ARP - 1 && if (i == IPV4_DEVCONF_PROXY_ARP - 1 &&
new_value != old_value) { new_value != old_value) {
ifindex = devinet_conf_ifindex(net, cnf); ifindex = devinet_conf_ifindex(net, cnf);
inet_netconf_notify_devconf(net, NETCONFA_PROXY_NEIGH, inet_netconf_notify_devconf(net, RTM_NEWNETCONF,
NETCONFA_PROXY_NEIGH,
ifindex, cnf); ifindex, cnf);
} }
if (i == IPV4_DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN - 1 && if (i == IPV4_DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN - 1 &&
new_value != old_value) { new_value != old_value) {
ifindex = devinet_conf_ifindex(net, cnf); ifindex = devinet_conf_ifindex(net, cnf);
inet_netconf_notify_devconf(net, NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN, inet_netconf_notify_devconf(net, RTM_NEWNETCONF,
NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN,
ifindex, cnf); ifindex, cnf);
} }
} }
@@ -2129,7 +2135,7 @@ static int devinet_sysctl_forward(struct ctl_table *ctl, int write,
container_of(cnf, struct in_device, cnf); container_of(cnf, struct in_device, cnf);
if (*valp) if (*valp)
dev_disable_lro(idev->dev); dev_disable_lro(idev->dev);
inet_netconf_notify_devconf(net, inet_netconf_notify_devconf(net, RTM_NEWNETCONF,
NETCONFA_FORWARDING, NETCONFA_FORWARDING,
idev->dev->ifindex, idev->dev->ifindex,
cnf); cnf);
@@ -2137,7 +2143,8 @@ static int devinet_sysctl_forward(struct ctl_table *ctl, int write,
rtnl_unlock(); rtnl_unlock();
rt_cache_flush(net); rt_cache_flush(net);
} else } else
inet_netconf_notify_devconf(net, NETCONFA_FORWARDING, inet_netconf_notify_devconf(net, RTM_NEWNETCONF,
NETCONFA_FORWARDING,
NETCONFA_IFINDEX_DEFAULT, NETCONFA_IFINDEX_DEFAULT,
net->ipv4.devconf_dflt); net->ipv4.devconf_dflt);
} }
@@ -2259,7 +2266,8 @@ static int __devinet_sysctl_register(struct net *net, char *dev_name,
p->sysctl = t; p->sysctl = t;
inet_netconf_notify_devconf(net, NETCONFA_ALL, ifindex, p); inet_netconf_notify_devconf(net, RTM_NEWNETCONF, NETCONFA_ALL,
ifindex, p);
return 0; return 0;
free: free:

12
net/ipv4/ipmr.c
View File

@@ -631,7 +631,7 @@ static int vif_delete(struct mr_table *mrt, int vifi, int notify,
in_dev = __in_dev_get_rtnl(dev); in_dev = __in_dev_get_rtnl(dev);
if (in_dev) { if (in_dev) {
IPV4_DEVCONF(in_dev->cnf, MC_FORWARDING)--; IPV4_DEVCONF(in_dev->cnf, MC_FORWARDING)--;
inet_netconf_notify_devconf(dev_net(dev), inet_netconf_notify_devconf(dev_net(dev), RTM_NEWNETCONF,
NETCONFA_MC_FORWARDING, NETCONFA_MC_FORWARDING,
dev->ifindex, &in_dev->cnf); dev->ifindex, &in_dev->cnf);
ip_rt_multicast_event(in_dev); ip_rt_multicast_event(in_dev);
@@ -820,8 +820,8 @@ static int vif_add(struct net *net, struct mr_table *mrt,
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
} }
IPV4_DEVCONF(in_dev->cnf, MC_FORWARDING)++; IPV4_DEVCONF(in_dev->cnf, MC_FORWARDING)++;
inet_netconf_notify_devconf(net, NETCONFA_MC_FORWARDING, dev->ifindex, inet_netconf_notify_devconf(net, RTM_NEWNETCONF, NETCONFA_MC_FORWARDING,
&in_dev->cnf); dev->ifindex, &in_dev->cnf);
ip_rt_multicast_event(in_dev); ip_rt_multicast_event(in_dev);
/* Fill in the VIF structures */ /* Fill in the VIF structures */
@@ -1282,7 +1282,8 @@ static void mrtsock_destruct(struct sock *sk)
ipmr_for_each_table(mrt, net) { ipmr_for_each_table(mrt, net) {
if (sk == rtnl_dereference(mrt->mroute_sk)) { if (sk == rtnl_dereference(mrt->mroute_sk)) {
IPV4_DEVCONF_ALL(net, MC_FORWARDING)--; IPV4_DEVCONF_ALL(net, MC_FORWARDING)--;
inet_netconf_notify_devconf(net, NETCONFA_MC_FORWARDING, inet_netconf_notify_devconf(net, RTM_NEWNETCONF,
NETCONFA_MC_FORWARDING,
NETCONFA_IFINDEX_ALL, NETCONFA_IFINDEX_ALL,
net->ipv4.devconf_all); net->ipv4.devconf_all);
RCU_INIT_POINTER(mrt->mroute_sk, NULL); RCU_INIT_POINTER(mrt->mroute_sk, NULL);
@@ -1344,7 +1345,8 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval,
if (ret == 0) { if (ret == 0) {
rcu_assign_pointer(mrt->mroute_sk, sk); rcu_assign_pointer(mrt->mroute_sk, sk);
IPV4_DEVCONF_ALL(net, MC_FORWARDING)++; IPV4_DEVCONF_ALL(net, MC_FORWARDING)++;
inet_netconf_notify_devconf(net, NETCONFA_MC_FORWARDING, inet_netconf_notify_devconf(net, RTM_NEWNETCONF,
NETCONFA_MC_FORWARDING,
NETCONFA_IFINDEX_ALL, NETCONFA_IFINDEX_ALL,
net->ipv4.devconf_all); net->ipv4.devconf_all);
} }