diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-03-09 19:13:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-03-09 19:13:11 -0800 |
| commit | 0f634eb32d3a5cba9d3411f23974962bb8f94bdd (patch) | |
| tree | c30c1d4aa7eb159a8cc808b47409a595fe575b41 /include/linux | |
| parent | 6a1b925ddace110c6f91df7df0c725faba63d8ab (diff) | |
| parent | 04db04202b006675c18c356aa69810f57e98a639 (diff) | |
Merge
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ip.h | 1 | ||||
| -rw-r--r-- | include/linux/rtnetlink.h | 1 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 12 |
3 files changed, 11 insertions, 3 deletions
diff --git a/include/linux/ip.h b/include/linux/ip.h index 487152a404f8..7d7633632d28 100644 --- a/include/linux/ip.h +++ b/include/linux/ip.h @@ -152,6 +152,7 @@ struct inet_sock { }; #define IPCORK_OPT 1 /* ip-options has been held in ipcork.opt */ +#define IPCORK_ALLFRAG 2 /* always fragment (for ipv6 for now) */ static inline struct inet_sock *inet_sk(const struct sock *sk) { diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index d93abe3c9faa..dbfe0df7795f 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -346,6 +346,7 @@ enum #define RTAX_FEATURE_ECN 0x00000001 #define RTAX_FEATURE_SACK 0x00000002 #define RTAX_FEATURE_TIMESTAMP 0x00000004 +#define RTAX_FEATURE_ALLFRAG 0x00000008 struct rta_session { diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 230d7d4014d4..358d52b0c445 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -399,6 +399,7 @@ enum NET_IPV4_CONF_FORCE_IGMP_VERSION=17, NET_IPV4_CONF_ARP_ANNOUNCE=18, NET_IPV4_CONF_ARP_IGNORE=19, + __NET_IPV4_CONF_MAX }; /* /proc/sys/net/ipv4/netfilter */ @@ -456,7 +457,8 @@ enum { NET_IPV6_ROUTE_GC_INTERVAL=6, NET_IPV6_ROUTE_GC_ELASTICITY=7, NET_IPV6_ROUTE_MTU_EXPIRES=8, - NET_IPV6_ROUTE_MIN_ADVMSS=9 + NET_IPV6_ROUTE_MIN_ADVMSS=9, + NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS=10 }; enum { @@ -476,7 +478,8 @@ enum { NET_IPV6_REGEN_MAX_RETRY=14, NET_IPV6_MAX_DESYNC_FACTOR=15, NET_IPV6_MAX_ADDRESSES=16, - NET_IPV6_FORCE_MLD_VERSION=17 + NET_IPV6_FORCE_MLD_VERSION=17, + __NET_IPV6_MAX }; /* /proc/sys/net/ipv6/icmp */ @@ -501,7 +504,10 @@ enum { NET_NEIGH_GC_INTERVAL=13, NET_NEIGH_GC_THRESH1=14, NET_NEIGH_GC_THRESH2=15, - NET_NEIGH_GC_THRESH3=16 + NET_NEIGH_GC_THRESH3=16, + NET_NEIGH_RETRANS_TIME_MS=17, + NET_NEIGH_REACHABLE_TIME_MS=18, + __NET_NEIGH_MAX }; /* /proc/sys/net/ipx */ |