From: osdl.org!shemminger <osdl.org!shemminger>
Date: Fri, 4 Jun 2004 18:39:32 +0000 (+0000)
Subject: TCPDIAG_VEGASINFO is not a #define, its an enum
X-Git-Tag: v2_6_7-ss040608~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15a79f12cdb9a0f076837c1535cb822e376b33db;p=thirdparty%2Fiproute2.git

TCPDIAG_VEGASINFO is not a #define, its an enum

(Logical change 1.7)
---

diff --git a/misc/ss.c b/misc/ss.c
index 7cf5f367e..a00d98826 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -1282,11 +1282,8 @@ void tcp_show_info(struct nlmsghdr *nlh, struct tcpdiagmsg *r)
 		minfo = RTA_DATA(tb[TCPDIAG_MEMINFO]);
 	if (tb[TCPDIAG_INFO])
 		info = RTA_DATA(tb[TCPDIAG_INFO]);
-
-#ifdef TCPDIAG_VEGASINFO
 	if (tb[TCPDIAG_VEGASINFO]) 
 		vinfo = RTA_DATA(tb[TCPDIAG_VEGASINFO]);
-#endif
 
 	if (minfo) {
 		printf(" mem:(r%u,w%u,f%u,t%u)",
@@ -1310,8 +1307,6 @@ void tcp_show_info(struct nlmsghdr *nlh, struct tcpdiagmsg *r)
 		if (info->tcpi_snd_ssthresh < 0xFFFF)
 			printf(" ssthresh:%d", info->tcpi_snd_ssthresh);
 
-
-#ifdef TCPDIAG_VEGASINFO
 		if (vinfo) {
 			if (vinfo->tcpv_enabled)
 				printf(" vegas");
@@ -1325,7 +1320,6 @@ void tcp_show_info(struct nlmsghdr *nlh, struct tcpdiagmsg *r)
 				       8000000. / (double) vinfo->tcpv_rtt);
 			}
 		}
-#endif
 	}
 #else
 #warning No TCP_INFO. Please, do not repeat this experiment, use right kernel.