From: stephen hemminger <stephen@networkplumber.org>
Date: Wed, 18 Dec 2013 06:35:52 +0000 (-0800)
Subject: netconf: rename PROXY_ARP to NEIGH_PROXY
X-Git-Tag: v3.14-rc1~94^2~403
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09aea5df7fbf0b987623f7007a11e64008284a0e;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed