leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netconf: rename PROXY_ARP to NEIGH_PROXY

Browse Source 
Use same field for both IPv4 (proxy_arp) and IPv6 (proxy_ndp)
so fix it before API is set to be a common name

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2013-12-17 22:35:52 -08:00 committed by David S. Miller
parent 345010b5c4
commit 09aea5df7f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/netconf.h
View File

@ -14,7 +14,7 @@ enum {
NETCONFA_FORWARDING, NETCONFA_FORWARDING,
NETCONFA_RP_FILTER, NETCONFA_RP_FILTER,
NETCONFA_MC_FORWARDING, NETCONFA_MC_FORWARDING,
NETCONFA_PROXY_ARP, NETCONFA_PROXY_NEIGH,
__NETCONFA_MAX __NETCONFA_MAX
}; };
#define NETCONFA_MAX (__NETCONFA_MAX - 1) #define NETCONFA_MAX (__NETCONFA_MAX - 1)

10
net/ipv4/devinet.c
View File

@ -1696,7 +1696,7 @@ static int inet_netconf_msgsize_devconf(int type)
size += nla_total_size(4); size += nla_total_size(4);
if (type == -1 || type == NETCONFA_MC_FORWARDING) if (type == -1 || type == NETCONFA_MC_FORWARDING)
size += nla_total_size(4); size += nla_total_size(4);
if (type == -1 || type == NETCONFA_PROXY_ARP) if (type == -1 || type == NETCONFA_PROXY_NEIGH)
size += nla_total_size(4); size += nla_total_size(4);
return size; return size;
@ -1734,8 +1734,8 @@ static int inet_netconf_fill_devconf(struct sk_buff *skb, int ifindex,
nla_put_s32(skb, NETCONFA_MC_FORWARDING, nla_put_s32(skb, NETCONFA_MC_FORWARDING,
IPV4_DEVCONF(*devconf, MC_FORWARDING)) < 0) IPV4_DEVCONF(*devconf, MC_FORWARDING)) < 0)
goto nla_put_failure; goto nla_put_failure;
if ((type == -1 || type == NETCONFA_PROXY_ARP) && if ((type == -1 || type == NETCONFA_PROXY_NEIGH) &&
nla_put_s32(skb, NETCONFA_PROXY_ARP, nla_put_s32(skb, NETCONFA_PROXY_NEIGH,
IPV4_DEVCONF(*devconf, PROXY_ARP)) < 0) IPV4_DEVCONF(*devconf, PROXY_ARP)) < 0)
goto nla_put_failure; goto nla_put_failure;
@ -1775,7 +1775,7 @@ static const struct nla_policy devconf_ipv4_policy[NETCONFA_MAX+1] = {
[NETCONFA_IFINDEX] = { .len = sizeof(int) }, [NETCONFA_IFINDEX] = { .len = sizeof(int) },
[NETCONFA_FORWARDING] = { .len = sizeof(int) }, [NETCONFA_FORWARDING] = { .len = sizeof(int) },
[NETCONFA_RP_FILTER] = { .len = sizeof(int) }, [NETCONFA_RP_FILTER] = { .len = sizeof(int) },
[NETCONFA_PROXY_ARP] = { .len = sizeof(int) }, [NETCONFA_PROXY_NEIGH] = { .len = sizeof(int) },
}; };
static int inet_netconf_get_devconf(struct sk_buff *in_skb, static int inet_netconf_get_devconf(struct sk_buff *in_skb,
@ -2002,7 +2002,7 @@ static int devinet_conf_proc(struct ctl_table *ctl, int write,
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_ARP, inet_netconf_notify_devconf(net, NETCONFA_PROXY_NEIGH,
ifindex, cnf); ifindex, cnf);
} }
} }