git://ftp.safe.ca
/
safe
/
jmp
/
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/davem/net-next-2.6
[safe/jmp/linux-2.6]
/
include
/
linux
/
sysctl.h
diff --git
a/include/linux/sysctl.h
b/include/linux/sysctl.h
index
c83a86a
..
56af3ca
100644
(file)
--- a/
include/linux/sysctl.h
+++ b/
include/linux/sysctl.h
@@
-481,6
+481,7
@@
enum
NET_IPV4_CONF_PROMOTE_SECONDARIES=20,
NET_IPV4_CONF_ARP_ACCEPT=21,
NET_IPV4_CONF_ARP_NOTIFY=22,
+ NET_IPV4_CONF_ACCEPT_LOCAL=23,
__NET_IPV4_CONF_MAX
};