From f16e6c9569cafdcccdeb52034bcdab45eba64bfc Mon Sep 17 00:00:00 2001
From: dimitri staessens <dimitri.staessens@ugent.be>
Date: Thu, 13 Apr 2017 15:54:54 +0200
Subject: ipcpd: Fix LLC shim for BSD using netmap

Fixes #22
---
 src/ipcpd/shim-eth-llc/main.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/ipcpd')

diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c
index 9a9e11b5..5ac3bb6f 100644
--- a/src/ipcpd/shim-eth-llc/main.c
+++ b/src/ipcpd/shim-eth-llc/main.c
@@ -745,18 +745,16 @@ static int eth_llc_ipcp_bootstrap(const struct ipcp_config * conf)
         struct ifreq     ifr;
 #ifdef HAVE_NETMAP
         char             ifn[IFNAMSIZ];
-    #ifndef __FreeBSD__
-        int              skfd;
-    #endif
 #else
         struct timeval   tv = {0, EVENT_WAIT_TIMEOUT * 1000};
-    #ifdef __FreeBSD__
+#endif /* HAVE_NETMAP */
+
+#ifdef __FreeBSD__
         struct ifaddrs * ifaddr;
         struct ifaddrs * ifa;
-    #endif
+#else
         int              skfd;
-#endif /* HAVE_NETMAP */
-
+#endif
         assert(conf);
         assert(conf->type == THIS_TYPE);
 
-- 
cgit v1.2.3