From e005bc819c201c49cf330a2607ad0770f145904e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Sat, 26 Mar 2016 03:16:17 +0000
Subject: Remove synchronous DNS name resolution
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ie5e670b769eb0674950f3679ef511047641c2873
Reviewed-on: https://code.wireshark.org/review/14751
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 epan/ipproto.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'epan/ipproto.c')

diff --git a/epan/ipproto.c b/epan/ipproto.c
index 4b1814ea88..f328bf504a 100644
--- a/epan/ipproto.c
+++ b/epan/ipproto.c
@@ -282,7 +282,7 @@ const char *ipprotostr(const int proto) {
      * protocol names?
      */
     if (gbl_resolv_flags.mac_name || gbl_resolv_flags.network_name ||
-        gbl_resolv_flags.transport_name || gbl_resolv_flags.concurrent_dns) {
+        gbl_resolv_flags.transport_name) {
         static char buf[128];
         struct protoent *pe;
 
-- 
cgit v1.2.1