diff options
author | luigi <luigi@FreeBSD.org> | 2013-04-19 21:08:21 +0000 |
---|---|---|
committer | luigi <luigi@FreeBSD.org> | 2013-04-19 21:08:21 +0000 |
commit | 82a36fa8a5aed61874c75c728665160310623182 (patch) | |
tree | 68f2b3985807f872cd24fc8f5cebb1080f1e5003 /sys/dev/netmap/netmap.c | |
parent | 9a543047eb5c6caa745ab785627c29aa050f3fe6 (diff) | |
download | FreeBSD-src-82a36fa8a5aed61874c75c728665160310623182.zip FreeBSD-src-82a36fa8a5aed61874c75c728665160310623182.tar.gz |
mostly whitespace changes:
- remove vestiges of the old memory allocator
- clean up some comments
Diffstat (limited to 'sys/dev/netmap/netmap.c')
-rw-r--r-- | sys/dev/netmap/netmap.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c index 4fec312..910ae6f 100644 --- a/sys/dev/netmap/netmap.c +++ b/sys/dev/netmap/netmap.c @@ -324,11 +324,7 @@ netmap_update_config(struct netmap_adapter *na) } /*------------- memory allocator -----------------*/ -#ifdef NETMAP_MEM2 #include "netmap_mem2.c" -#else /* !NETMAP_MEM2 */ -#include "netmap_mem1.c" -#endif /* !NETMAP_MEM2 */ /*------------ end of memory allocator ----------*/ @@ -498,16 +494,16 @@ netmap_dtor(void *data) { struct netmap_priv_d *priv = data; struct ifnet *ifp = priv->np_ifp; - struct netmap_adapter *na; NMA_LOCK(); if (ifp) { - na = NA(ifp); + struct netmap_adapter *na = NA(ifp); + na->nm_lock(ifp, NETMAP_REG_LOCK, 0); netmap_dtor_locked(data); na->nm_lock(ifp, NETMAP_REG_UNLOCK, 0); - nm_if_rele(ifp); + nm_if_rele(ifp); /* might also destroy *na */ } if (priv->ref_done) { netmap_memory_deref(); |