diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-25 19:02:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-25 19:02:02 -0700 |
| commit | 5ac16be863f3a830d716989fd33bd27fcd8aa43d (patch) | |
| tree | ef36db64faccf10f12c3af7bafd3f9993e445cef /include/linux | |
| parent | 2ce6c0f56af9a2db006129f2fd83d727543ade2a (diff) | |
| parent | c2d26a96a9571b92d996c10ab9336d01a0801df1 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if.h | 1 | ||||
| -rw-r--r-- | include/linux/tcp_diag.h | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/linux/if.h b/include/linux/if.h index 0a3fdd8cab13..9370fd10614b 100644 --- a/include/linux/if.h +++ b/include/linux/if.h @@ -21,6 +21,7 @@ #include <linux/types.h> /* for "__kernel_caddr_t" et al */ #include <linux/socket.h> /* for "struct sockaddr" et al */ +#include <linux/compiler.h> /* for "__user" et al */ #define IFNAMSIZ 16 #include <linux/hdlc/ioctl.h> diff --git a/include/linux/tcp_diag.h b/include/linux/tcp_diag.h index 91a8fa70e198..ceee962e1d15 100644 --- a/include/linux/tcp_diag.h +++ b/include/linux/tcp_diag.h @@ -98,9 +98,10 @@ enum TCPDIAG_NONE, TCPDIAG_MEMINFO, TCPDIAG_INFO, + TCPDIAG_VEGASINFO, }; -#define TCPDIAG_MAX TCPDIAG_INFO +#define TCPDIAG_MAX TCPDIAG_VEGASINFO /* TCPDIAG_MEM */ @@ -113,4 +114,14 @@ struct tcpdiag_meminfo __u32 tcpdiag_tmem; }; +/* TCPDIAG_VEGASINFO */ + +struct tcpvegas_info { + __u32 tcpv_enabled; + __u32 tcpv_rttcnt; + __u32 tcpv_rtt; + __u32 tcpv_minrtt; +}; + + #endif /* _TCP_DIAG_H_ */ |