diff options
| author | Dimitri Staessens <dimitri.staessens@ugent.be> | 2017-11-10 14:10:10 +0100 | 
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-11-10 15:21:29 +0100 | 
| commit | a1127d54b52d76f0bb5e79d5fc973a2c41a8200d (patch) | |
| tree | 9c5de6b15ce636bf1e0ea2807eac21a93c28eb76 /src/ipcpd/shim-eth-llc | |
| parent | 967e8301f735bd74d569c54ed9f547b8dfa8d115 (diff) | |
| download | ouroboros-a1127d54b52d76f0bb5e79d5fc973a2c41a8200d.tar.gz ouroboros-a1127d54b52d76f0bb5e79d5fc973a2c41a8200d.zip | |
ipcpd: Fix unused label with netmap for LLC shim
When the netmap driver is used for the LLC shim, the label
fail_device: was never used, resulting in a compiler error.
Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
Diffstat (limited to 'src/ipcpd/shim-eth-llc')
| -rw-r--r-- | src/ipcpd/shim-eth-llc/main.c | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c index e735b651..4f4c98ea 100644 --- a/src/ipcpd/shim-eth-llc/main.c +++ b/src/ipcpd/shim-eth-llc/main.c @@ -1117,11 +1117,13 @@ static int eth_llc_ipcp_bootstrap(const struct ipcp_config * conf)          pthread_cancel(eth_llc_data.mgmt_handler);          pthread_join(eth_llc_data.mgmt_handler, NULL);   fail_mgmt_handler: -#ifdef __linux__ +#if defined(__linux__)          pthread_cancel(eth_llc_data.if_monitor);          pthread_join(eth_llc_data.if_monitor, NULL);  #endif +#if !defined(HAVE_NETMAP)   fail_device: +#endif  #if defined(HAVE_NETMAP)          nm_close(eth_llc_data.nmd);  #elif defined(HAVE_BPF) | 
