commit 4540250be1d724943a55eb9668e6edc1aaae28c4
author YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Tue May 29 13:23:34 2007 -0700
committer David S. Miller <davem@sunset.davemloft.net> Thu May 31 01:23:36 2007 -0700
tree 950d61c92b3130df509804b7204a20c7a33e0567
parent b0ba66671a92f7d12fdbc42592d36e678f713efc

[IPV6] ADDRCONF: Fix conflicts in DEVCONF_xxx constant.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

include/linux/ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 09ea01a..648bd1f 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -209,9 +209,8 @@
 	DEVCONF_RTR_PROBE_INTERVAL,
 	DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,
 	DEVCONF_PROXY_NDP,
-	__DEVCONF_OPTIMISTIC_DAD,
-	DEVCONF_ACCEPT_SOURCE_ROUTE,
 	DEVCONF_OPTIMISTIC_DAD,
+	DEVCONF_ACCEPT_SOURCE_ROUTE,
 	DEVCONF_MAX
 };