Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4540250be1d724943a55eb9668e6edc1aaae28c4 Commit: 4540250be1d724943a55eb9668e6edc1aaae28c4 Parent: b0ba66671a92f7d12fdbc42592d36e678f713efc Author: YOSHIFUJI Hideaki <[EMAIL PROTECTED]> AuthorDate: Tue May 29 13:23:34 2007 -0700 Committer: David S. Miller <[EMAIL PROTECTED]> CommitDate: Thu May 31 01:23:36 2007 -0700
[IPV6] ADDRCONF: Fix conflicts in DEVCONF_xxx constant. Signed-off-by: YOSHIFUJI Hideaki <[EMAIL PROTECTED]> Signed-off-by: David S. Miller <[EMAIL PROTECTED]> --- include/linux/ipv6.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) 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 @@ enum { 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 }; - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html