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