Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/tcp_diag.h b/include/linux/tcp_diag.h
index ceee962e1d15..7a5996743946 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_ */