diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-01-31 01:42:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-01-31 01:42:38 -0800 |
| commit | 5b43ae287929efbcb620becdf65979b0b4e70b01 (patch) | |
| tree | 0f45b2b00ecb9766a041ba7dd3c074e1c3a71deb /include/linux/sysctl.h | |
| parent | 4093261b82b7dbe3be34d38e106a3de9ffffa771 (diff) | |
| parent | 5c4ef8ee1781026c3cf930746400e783acc103f0 (diff) | |
Resolve conflicts in sha256.c change, use Linus's version.
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 0d5b121f54a0..b8806feac0b5 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -360,6 +360,7 @@ enum NET_IPV4_CONF_MEDIUM_ID=14, NET_IPV4_CONF_NOXFRM=15, NET_IPV4_CONF_NOPOLICY=16, + NET_IPV4_CONF_FORCE_IGMP_VERSION=17, }; /* /proc/sys/net/ipv4/netfilter */ |