projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b0ba666
)
[IPV6] ADDRCONF: Fix conflicts in DEVCONF_xxx constant.
author
YOSHIFUJI Hideaki
<yoshfuji@linux-ipv6.org>
Tue, 29 May 2007 20:23:34 +0000
(13:23 -0700)
committer
David S. Miller
<davem@sunset.davemloft.net>
Thu, 31 May 2007 08:23:36 +0000
(
01:23
-0700)
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/ipv6.h
patch
|
blob
|
history
diff --git
a/include/linux/ipv6.h
b/include/linux/ipv6.h
index
09ea01a
..
648bd1f
100644
(file)
--- 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
};