projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
[linux-2.6]
/
include
/
linux
/
if_addr.h
diff --git
a/include/linux/if_addr.h
b/include/linux/if_addr.h
index
d557e4c
..
43f3bed
100644
(file)
--- a/
include/linux/if_addr.h
+++ b/
include/linux/if_addr.h
@@
-39,6
+39,7
@@
enum
#define IFA_F_TEMPORARY IFA_F_SECONDARY
#define IFA_F_NODAD 0x02
+#define IFA_F_OPTIMISTIC 0x04
#define IFA_F_HOMEADDRESS 0x10
#define IFA_F_DEPRECATED 0x20
#define IFA_F_TENTATIVE 0x40