diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2003-05-29 08:22:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2003-05-29 08:22:26 -0700 |
| commit | d91bd472ef492faf566f64d2c79afbee41052cce (patch) | |
| tree | 05c821613a046ba7d36aceb0a6e852e22f2136f0 /include/linux | |
| parent | cd23eff8d8ce9a8ac4b24a30a73430cdd6c3567c (diff) | |
| parent | ee2c00206990f3df40671f5435e6814c41702b69 (diff) | |
Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
into kernel.bkbits.net:/home/davem/net-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 2 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index e445c167c919..ff568eaf4f3a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -147,8 +147,6 @@ enum { #ifdef __KERNEL__ -extern const char *if_port_text[]; - #include <linux/cache.h> #include <linux/skbuff.h> diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index d35eacac5acf..bbd0b376d757 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -366,7 +366,11 @@ enum { NET_IPV6_NEIGH=17, NET_IPV6_ROUTE=18, NET_IPV6_ICMP=19, - NET_IPV6_BINDV6ONLY=20 + NET_IPV6_BINDV6ONLY=20, + NET_IPV6_IP6FRAG_HIGH_THRESH=21, + NET_IPV6_IP6FRAG_LOW_THRESH=22, + NET_IPV6_IP6FRAG_TIME=23, + NET_IPV6_IP6FRAG_SECRET_INTERVAL=24 }; enum { |