From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sun, 28 Nov 2010 21:03:49 +0000 (+0100)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
X-Git-Tag: fix-allnoconfig~323
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/bf292360f36b659d194a1166587c9487c2b866d5?hp=eb3365e7224b7391eeee0df3f4322d6761a9a6fd

Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
---

diff --git a/latester/latester.c b/latester/latester.c
index 774e9d9..6b5c7ed 100644
--- a/latester/latester.c
+++ b/latester/latester.c
@@ -302,10 +302,10 @@ void *measure_thread(void *arg)
 			       &timestamp_on, sizeof(timestamp_on)) < 0)
 			error(1, errno, "setsockopt SO_TIMESTAMP");
 
-		const int dropmonitor_on = 1;
-		if (setsockopt(s, SOL_SOCKET, SO_RXQ_OVFL,
-			       &dropmonitor_on, sizeof(dropmonitor_on)) < 0)
-			error(1, errno, "setsockopt SO_RXQ_OVFL not supported by your Linux Kernel");
+//		const int dropmonitor_on = 1;
+//		if (setsockopt(s, SOL_SOCKET, SO_RXQ_OVFL,
+//			       &dropmonitor_on, sizeof(dropmonitor_on)) < 0)
+//			error(1, errno, "setsockopt SO_RXQ_OVFL not supported by your Linux Kernel");
 
 		pfd[i].fd = s;
 		pfd[i].events = (i == 0) ? POLLERR : POLLIN;