From: Stephen Hemminger <stephen@networkplumber•org>
To: David Miller <davem@davemloft•net>
Cc: netdev@vger•kernel.org
Subject: [PATCH net-next 1/3] netconf: rename PROXY_ARP to NEIGH_PROXY
Date: Tue, 17 Dec 2013 22:35:52 -0800 [thread overview]
Message-ID: <20131217223552.60d1f5cb@nehalam.linuxnetplumber.net> (raw)
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>
---
include/uapi/linux/netconf.h | 2 +-
net/ipv4/devinet.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
--- a/include/uapi/linux/netconf.h 2013-12-17 22:30:00.000000000 -0800
+++ b/include/uapi/linux/netconf.h 2013-12-17 22:31:07.973419694 -0800
@@ -14,7 +14,7 @@ enum {
NETCONFA_FORWARDING,
NETCONFA_RP_FILTER,
NETCONFA_MC_FORWARDING,
- NETCONFA_PROXY_ARP,
+ NETCONFA_PROXY_NEIGH,
__NETCONFA_MAX
};
#define NETCONFA_MAX (__NETCONFA_MAX - 1)
--- a/net/ipv4/devinet.c 2013-12-17 22:30:00.000000000 -0800
+++ b/net/ipv4/devinet.c 2013-12-17 22:31:07.973419694 -0800
@@ -1696,7 +1696,7 @@ static int inet_netconf_msgsize_devconf(
size += nla_total_size(4);
if (type == -1 || type == NETCONFA_MC_FORWARDING)
size += nla_total_size(4);
- if (type == -1 || type == NETCONFA_PROXY_ARP)
+ if (type == -1 || type == NETCONFA_PROXY_NEIGH)
size += nla_total_size(4);
return size;
@@ -1734,8 +1734,8 @@ static int inet_netconf_fill_devconf(str
nla_put_s32(skb, NETCONFA_MC_FORWARDING,
IPV4_DEVCONF(*devconf, MC_FORWARDING)) < 0)
goto nla_put_failure;
- if ((type == -1 || type == NETCONFA_PROXY_ARP) &&
- nla_put_s32(skb, NETCONFA_PROXY_ARP,
+ if ((type == -1 || type == NETCONFA_PROXY_NEIGH) &&
+ nla_put_s32(skb, NETCONFA_PROXY_NEIGH,
IPV4_DEVCONF(*devconf, PROXY_ARP)) < 0)
goto nla_put_failure;
@@ -1775,7 +1775,7 @@ static const struct nla_policy devconf_i
[NETCONFA_IFINDEX] = { .len = sizeof(int) },
[NETCONFA_FORWARDING] = { .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,
@@ -2002,7 +2002,7 @@ static int devinet_conf_proc(struct ctl_
if (i == IPV4_DEVCONF_PROXY_ARP - 1 &&
new_value != old_value) {
ifindex = devinet_conf_ifindex(net, cnf);
- inet_netconf_notify_devconf(net, NETCONFA_PROXY_ARP,
+ inet_netconf_notify_devconf(net, NETCONFA_PROXY_NEIGH,
ifindex, cnf);
}
}
next reply other threads:[~2013-12-18 6:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-18 6:35 Stephen Hemminger [this message]
2013-12-18 6:37 ` [PATCH net-next 2/3] netconf: add support for IPv6 proxy_ndp Stephen Hemminger
2013-12-20 10:05 ` Nicolas Dichtel
2013-12-22 23:03 ` David Miller
2013-12-18 6:39 ` [PATCH iproute 3/3] iproute2: add proxy_neigh attribute Stephen Hemminger
2013-12-18 17:06 ` [PATCH net-next 1/3] netconf: rename PROXY_ARP to NEIGH_PROXY Jamal Hadi Salim
2013-12-18 18:06 ` Stephen Hemminger
2013-12-20 10:02 ` Nicolas Dichtel
2013-12-22 23:03 ` David Miller
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=20131217223552.60d1f5cb@nehalam.linuxnetplumber.net \
--to=stephen@networkplumber$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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