diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 17:26:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 17:26:31 -0700 |
commit | a39451c17f53bbae053555670c7b678d46bcebba (patch) | |
tree | 8bb6106ec7812a421c3d3eb9c8c273580cc703fc /include/linux/tcp_diag.h | |
parent | adb7ee3746b579a7fa7af7c4ec2c8164bc910ed4 (diff) | |
parent | 0e57976b6376f7fda6bef8b7dee2a3c8819ec9e9 (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/tcp_diag.h')
-rw-r--r-- | include/linux/tcp_diag.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/tcp_diag.h b/include/linux/tcp_diag.h index ceee962e1d1..7a599674394 100644 --- a/include/linux/tcp_diag.h +++ b/include/linux/tcp_diag.h @@ -99,9 +99,10 @@ enum TCPDIAG_MEMINFO, TCPDIAG_INFO, TCPDIAG_VEGASINFO, + TCPDIAG_CONG, }; -#define TCPDIAG_MAX TCPDIAG_VEGASINFO +#define TCPDIAG_MAX TCPDIAG_CONG /* TCPDIAG_MEM */ @@ -123,5 +124,4 @@ struct tcpvegas_info { __u32 tcpv_minrtt; }; - #endif /* _TCP_DIAG_H_ */ |