]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
netmap: get correct RSS queues on Linux as well 2133/head
authorVictor Julien <victor@inliniac.net>
Thu, 2 Jun 2016 09:01:29 +0000 (11:01 +0200)
committerVictor Julien <victor@inliniac.net>
Thu, 2 Jun 2016 09:01:29 +0000 (11:01 +0200)
src/runmode-netmap.c

index dc3833abe6c70ef71a20d08e84234464310717f8..fcd2a0bd7025b3fe4b56ad541f6f42a6df5837f7 100644 (file)
@@ -255,7 +255,12 @@ static void *ParseNetmapConfig(const char *iface_name)
 finalize:
 
     if (aconf->threads == 0) {
-        aconf->threads = NetmapGetRSSCount(aconf->iface);
+        /* As NetmapGetRSSCount is broken on Linux, first run
+         * GetIfaceRSSQueuesNum. If that fails, run NetmapGetRSSCount */
+        aconf->threads = GetIfaceRSSQueuesNum(aconf->iface);
+        if (aconf->threads == 0) {
+            aconf->threads = NetmapGetRSSCount(aconf->iface);
+        }
     }
     if (aconf->threads <= 0) {
         aconf->threads = 1;