diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-29 09:50:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-29 09:50:36 -0700 |
| commit | d8f87a6c97470620937e43eb27e0592373e343c5 (patch) | |
| tree | 284bec3e2e1a620aa0935d00fc3391aa4c04d295 /include/linux | |
| parent | 6fcb1ca44d564d30e3a4dde41661c30c5b0dbe0b (diff) | |
| parent | ef6ba8739f585aeb653d1012b3a47636066f9261 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
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 { |