git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 345010b)
netconf: rename PROXY_ARP to NEIGH_PROXY
authorstephen hemminger <stephen@networkplumber.org>
Wed, 18 Dec 2013 06:35:52 +0000 (22:35 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 22 Dec 2013 23:02:43 +0000 (18:02 -0500)
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>
include/uapi/linux/netconf.h patch | blob | history
net/ipv4/devinet.c patch | blob | history

diff --cc include/uapi/linux/netconf.h
Simple merge
diff --cc net/ipv4/devinet.c
Simple merge
Pandora Kernel Repository