summaryrefslogtreecommitdiff
path: root/src/ipcpd/shim-eth-llc
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-04-13 17:26:32 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-04-13 17:26:32 +0000
commite543c43c9f911bbe40371e3c6ca5c916cb3365a9 (patch)
tree5ecc3fa14437b10289929b30607cabfdde23fdb8 /src/ipcpd/shim-eth-llc
parent58a31360a6637b564dc73246b8e50ca9d0f39b8c (diff)
parentf16e6c9569cafdcccdeb52034bcdab45eba64bfc (diff)
downloadouroboros-e543c43c9f911bbe40371e3c6ca5c916cb3365a9.tar.gz
ouroboros-e543c43c9f911bbe40371e3c6ca5c916cb3365a9.zip
Merged in dstaesse/ouroboros/be-bsd (pull request #483)
ipcpd: Fix LLC shim for BSD using netmap
Diffstat (limited to 'src/ipcpd/shim-eth-llc')
-rw-r--r--src/ipcpd/shim-eth-llc/main.c12
1 files changed, 5 insertions, 7 deletions
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);