aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2013-12-18 01:35:52 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-22 18:02:43 -0500
commit09aea5df7fbf0b987623f7007a11e64008284a0e (patch)
tree9b9ace4b680455a4df9d97de54f7134fe52c6443 /include
parent345010b5c488d754ecff98c4435a2a82949c9cf4 (diff)
netconf: rename PROXY_ARP to NEIGH_PROXY
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>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/netconf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/netconf.h b/include/uapi/linux/netconf.h
index bd969d77ce52..669a1f0b1d97 100644
--- a/include/uapi/linux/netconf.h
+++ b/include/uapi/linux/netconf.h
@@ -14,7 +14,7 @@ enum {
14 NETCONFA_FORWARDING, 14 NETCONFA_FORWARDING,
15 NETCONFA_RP_FILTER, 15 NETCONFA_RP_FILTER,
16 NETCONFA_MC_FORWARDING, 16 NETCONFA_MC_FORWARDING,
17 NETCONFA_PROXY_ARP, 17 NETCONFA_PROXY_NEIGH,
18 __NETCONFA_MAX 18 __NETCONFA_MAX
19}; 19};
20#define NETCONFA_MAX (__NETCONFA_MAX - 1) 20#define NETCONFA_MAX (__NETCONFA_MAX - 1)