diff options
author | andre <andre@FreeBSD.org> | 2013-08-24 11:24:15 +0000 |
---|---|---|
committer | andre <andre@FreeBSD.org> | 2013-08-24 11:24:15 +0000 |
commit | 5ec35e1f72d57fe05547d8e07db8121610058988 (patch) | |
tree | a0846f72e68a69a1e0dd8017e1fdbb98460cff12 /sys/net | |
parent | 8851d5babc82b29f61b40856cf77816e6081d2d9 (diff) | |
download | FreeBSD-src-5ec35e1f72d57fe05547d8e07db8121610058988.zip FreeBSD-src-5ec35e1f72d57fe05547d8e07db8121610058988.tar.gz |
ename PFIL_LIST_[UN]LOCK() to PFIL_HEADLIST_[UN]LOCK() to avoid
confusion with the pfil_head chain locking macros.
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/pfil.c | 14 | ||||
-rw-r--r-- | sys/net/pfil.h | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sys/net/pfil.c b/sys/net/pfil.c index 45d8f4b..44373ee 100644 --- a/sys/net/pfil.c +++ b/sys/net/pfil.c @@ -173,11 +173,11 @@ pfil_head_register(struct pfil_head *ph) { struct pfil_head *lph; - PFIL_LIST_LOCK(); + PFIL_HEADLIST_LOCK(); LIST_FOREACH(lph, &V_pfil_head_list, ph_list) { if (ph->ph_type == lph->ph_type && ph->ph_un.phu_val == lph->ph_un.phu_val) { - PFIL_LIST_UNLOCK(); + PFIL_HEADLIST_UNLOCK(); return (EEXIST); } } @@ -186,7 +186,7 @@ pfil_head_register(struct pfil_head *ph) TAILQ_INIT(&ph->ph_in); TAILQ_INIT(&ph->ph_out); LIST_INSERT_HEAD(&V_pfil_head_list, ph, ph_list); - PFIL_LIST_UNLOCK(); + PFIL_HEADLIST_UNLOCK(); return (0); } @@ -200,9 +200,9 @@ pfil_head_unregister(struct pfil_head *ph) { struct packet_filter_hook *pfh, *pfnext; - PFIL_LIST_LOCK(); + PFIL_HEADLIST_LOCK(); LIST_REMOVE(ph, ph_list); - PFIL_LIST_UNLOCK(); + PFIL_HEADLIST_UNLOCK(); TAILQ_FOREACH_SAFE(pfh, &ph->ph_in, pfil_chain, pfnext) free(pfh, M_IFADDR); TAILQ_FOREACH_SAFE(pfh, &ph->ph_out, pfil_chain, pfnext) @@ -219,11 +219,11 @@ pfil_head_get(int type, u_long val) { struct pfil_head *ph; - PFIL_LIST_LOCK(); + PFIL_HEADLIST_LOCK(); LIST_FOREACH(ph, &V_pfil_head_list, ph_list) if (ph->ph_type == type && ph->ph_un.phu_val == val) break; - PFIL_LIST_UNLOCK(); + PFIL_HEADLIST_UNLOCK(); return (ph); } diff --git a/sys/net/pfil.h b/sys/net/pfil.h index 6e4ccce6..33d9d0e 100644 --- a/sys/net/pfil.h +++ b/sys/net/pfil.h @@ -138,7 +138,9 @@ int pfil_wowned(struct pfil_head *ph); #define PFIL_RUNLOCK(p, t) rm_runlock((p)->ph_plock, (t)) #define PFIL_WUNLOCK(p) rm_wunlock((p)->ph_plock) #define PFIL_WOWNED(p) rm_wowned((p)->ph_plock) -#define PFIL_LIST_LOCK() mtx_lock(&pfil_global_lock) -#define PFIL_LIST_UNLOCK() mtx_unlock(&pfil_global_lock) + +/* Internal locking macros for global/vnet pfil_head_list. */ +#define PFIL_HEADLIST_LOCK() mtx_lock(&pfil_global_lock) +#define PFIL_HEADLIST_UNLOCK() mtx_unlock(&pfil_global_lock) #endif /* _NET_PFIL_H_ */ |