1*bffdb3e0SAndrew GeisslerFrom 6dd5b2b1f3ae3479647e2ef66e390d031066defe Mon Sep 17 00:00:00 2001 2*bffdb3e0SAndrew GeisslerFrom: Khem Raj <raj.khem@gmail.com> 3*bffdb3e0SAndrew GeisslerDate: Wed, 12 Aug 2020 09:57:23 -0700 4*bffdb3e0SAndrew GeisslerSubject: [PATCH] nettest_omni: Remove duplicate variable definitions 5*bffdb3e0SAndrew Geissler 6*bffdb3e0SAndrew GeisslerThese defines are already defined in nettest_bsd.c and exported by 7*bffdb3e0SAndrew Geisslernettest_bsd.h this should fix build with -fno-common 8*bffdb3e0SAndrew Geissler 9*bffdb3e0SAndrew GeisslerUpstream-Status: Submitted [https://github.com/HewlettPackard/netperf/pull/46] 10*bffdb3e0SAndrew Geissler 11*bffdb3e0SAndrew GeisslerSigned-off-by: Khem Raj <raj.khem@gmail.com> 12*bffdb3e0SAndrew Geissler--- 13*bffdb3e0SAndrew Geissler src/nettest_omni.c | 8 -------- 14*bffdb3e0SAndrew Geissler 1 file changed, 8 deletions(-) 15*bffdb3e0SAndrew Geissler 16*bffdb3e0SAndrew Geisslerdiff --git a/src/nettest_omni.c b/src/nettest_omni.c 17*bffdb3e0SAndrew Geisslerindex 852eeb1..862088a 100644 18*bffdb3e0SAndrew Geissler--- a/src/nettest_omni.c 19*bffdb3e0SAndrew Geissler+++ b/src/nettest_omni.c 20*bffdb3e0SAndrew Geissler@@ -458,14 +458,6 @@ static int client_port_max = 65535; 21*bffdb3e0SAndrew Geissler 22*bffdb3e0SAndrew Geissler /* different options for the sockets */ 23*bffdb3e0SAndrew Geissler 24*bffdb3e0SAndrew Geissler-int 25*bffdb3e0SAndrew Geissler- loc_nodelay, /* don't/do use NODELAY locally */ 26*bffdb3e0SAndrew Geissler- rem_nodelay, /* don't/do use NODELAY remotely */ 27*bffdb3e0SAndrew Geissler- loc_sndavoid, /* avoid send copies locally */ 28*bffdb3e0SAndrew Geissler- loc_rcvavoid, /* avoid recv copies locally */ 29*bffdb3e0SAndrew Geissler- rem_sndavoid, /* avoid send copies remotely */ 30*bffdb3e0SAndrew Geissler- rem_rcvavoid; /* avoid recv_copies remotely */ 31*bffdb3e0SAndrew Geissler- 32*bffdb3e0SAndrew Geissler extern int 33*bffdb3e0SAndrew Geissler loc_tcpcork, 34*bffdb3e0SAndrew Geissler rem_tcpcork, 35*bffdb3e0SAndrew Geissler-- 36*bffdb3e0SAndrew Geissler2.28.0 37*bffdb3e0SAndrew Geissler 38