d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netmap: get rid of WNA() macro

Browse Source 
MFC after:	7 days
This commit is contained in:
Vincenzo Maffione 2023-03-11 17:19:01 +00:00
parent 3e1155ade1
commit 22bf2a479f
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/netmap/netmap_generic.c
View File

@ -1034,10 +1034,6 @@ generic_netmap_dtor(struct netmap_adapter *na)
nm_prinf("Native netmap adapter for %s restored", prev_na->name);
}
NM_RESTORE_NA(ifp, prev_na);
/*
* netmap_detach_common(), that it's called after this function,
* overrides WNA(ifp) if na->ifp is not NULL.
*/
na->ifp = NULL;
nm_prinf("Emulated netmap adapter for %s destroyed", na->name);
}

9
sys/dev/netmap/netmap_kern.h
View File

@ -110,8 +110,6 @@
#define NM_ATOMIC_TEST_AND_SET(p) (!atomic_cmpset_acq_int((p), 0, 1))
#define NM_ATOMIC_CLEAR(p) atomic_store_rel_int((p), 0)
#define WNA(_ifp) if_getnetmapadapter(_ifp)
struct netmap_adapter *netmap_getna(if_t ifp);
#define MBUF_REFCNT(m) ((m)->m_ext.ext_count)
@ -1690,13 +1688,14 @@ extern int netmap_generic_txqdisc;
/*
* NA returns a pointer to the struct netmap adapter from the ifp.
* WNA is os-specific and must be defined in glue code.
* The if_getnetmapadapter() and if_setnetmapadapter() helpers are
* os-specific and must be defined in glue code.
*/
#define NA(_ifp) ((struct netmap_adapter *)WNA(_ifp))
#define NA(_ifp) (if_getnetmapadapter(_ifp))
/*
* we provide a default implementation of NM_ATTACH_NA/NM_DETACH_NA
* based on the WNA field.
* based on the if_setnetmapadapter() setter function.
* Glue code may override this by defining its own NM_ATTACH_NA
*/
#ifndef NM_ATTACH_NA