mirror of
https://github.com/opnsense/src.git
synced 2026-04-22 14:49:36 -04:00
Sync to MAC tree: use 'flag' instead of 'how' for mac_init_mbuf();
remove a slightly less than useful comment.
This commit is contained in:
parent
dab3d85fd7
commit
a931e345a9
9 changed files with 27 additions and 27 deletions
|
|
@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac)
|
|||
}
|
||||
|
||||
int
|
||||
mac_init_mbuf(struct mbuf *m, int how)
|
||||
mac_init_mbuf(struct mbuf *m, int flag)
|
||||
{
|
||||
KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf"));
|
||||
|
||||
/* "how" is one of M_(TRY|DONT)WAIT */
|
||||
mac_init_label(&m->m_pkthdr.label);
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how);
|
||||
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag);
|
||||
#ifdef MAC_DEBUG
|
||||
atomic_add_int(&nmacmbufs, 1);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac)
|
|||
}
|
||||
|
||||
int
|
||||
mac_init_mbuf(struct mbuf *m, int how)
|
||||
mac_init_mbuf(struct mbuf *m, int flag)
|
||||
{
|
||||
KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf"));
|
||||
|
||||
/* "how" is one of M_(TRY|DONT)WAIT */
|
||||
mac_init_label(&m->m_pkthdr.label);
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how);
|
||||
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag);
|
||||
#ifdef MAC_DEBUG
|
||||
atomic_add_int(&nmacmbufs, 1);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac)
|
|||
}
|
||||
|
||||
int
|
||||
mac_init_mbuf(struct mbuf *m, int how)
|
||||
mac_init_mbuf(struct mbuf *m, int flag)
|
||||
{
|
||||
KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf"));
|
||||
|
||||
/* "how" is one of M_(TRY|DONT)WAIT */
|
||||
mac_init_label(&m->m_pkthdr.label);
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how);
|
||||
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag);
|
||||
#ifdef MAC_DEBUG
|
||||
atomic_add_int(&nmacmbufs, 1);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac)
|
|||
}
|
||||
|
||||
int
|
||||
mac_init_mbuf(struct mbuf *m, int how)
|
||||
mac_init_mbuf(struct mbuf *m, int flag)
|
||||
{
|
||||
KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf"));
|
||||
|
||||
/* "how" is one of M_(TRY|DONT)WAIT */
|
||||
mac_init_label(&m->m_pkthdr.label);
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how);
|
||||
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag);
|
||||
#ifdef MAC_DEBUG
|
||||
atomic_add_int(&nmacmbufs, 1);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac)
|
|||
}
|
||||
|
||||
int
|
||||
mac_init_mbuf(struct mbuf *m, int how)
|
||||
mac_init_mbuf(struct mbuf *m, int flag)
|
||||
{
|
||||
KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf"));
|
||||
|
||||
/* "how" is one of M_(TRY|DONT)WAIT */
|
||||
mac_init_label(&m->m_pkthdr.label);
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how);
|
||||
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag);
|
||||
#ifdef MAC_DEBUG
|
||||
atomic_add_int(&nmacmbufs, 1);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac)
|
|||
}
|
||||
|
||||
int
|
||||
mac_init_mbuf(struct mbuf *m, int how)
|
||||
mac_init_mbuf(struct mbuf *m, int flag)
|
||||
{
|
||||
KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf"));
|
||||
|
||||
/* "how" is one of M_(TRY|DONT)WAIT */
|
||||
mac_init_label(&m->m_pkthdr.label);
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how);
|
||||
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag);
|
||||
#ifdef MAC_DEBUG
|
||||
atomic_add_int(&nmacmbufs, 1);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac)
|
|||
}
|
||||
|
||||
int
|
||||
mac_init_mbuf(struct mbuf *m, int how)
|
||||
mac_init_mbuf(struct mbuf *m, int flag)
|
||||
{
|
||||
KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf"));
|
||||
|
||||
/* "how" is one of M_(TRY|DONT)WAIT */
|
||||
mac_init_label(&m->m_pkthdr.label);
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how);
|
||||
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag);
|
||||
#ifdef MAC_DEBUG
|
||||
atomic_add_int(&nmacmbufs, 1);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac)
|
|||
}
|
||||
|
||||
int
|
||||
mac_init_mbuf(struct mbuf *m, int how)
|
||||
mac_init_mbuf(struct mbuf *m, int flag)
|
||||
{
|
||||
KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf"));
|
||||
|
||||
/* "how" is one of M_(TRY|DONT)WAIT */
|
||||
mac_init_label(&m->m_pkthdr.label);
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how);
|
||||
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag);
|
||||
#ifdef MAC_DEBUG
|
||||
atomic_add_int(&nmacmbufs, 1);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1044,13 +1044,13 @@ mac_init_structmac(struct mac *mac)
|
|||
}
|
||||
|
||||
int
|
||||
mac_init_mbuf(struct mbuf *m, int how)
|
||||
mac_init_mbuf(struct mbuf *m, int flag)
|
||||
{
|
||||
KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf"));
|
||||
|
||||
/* "how" is one of M_(TRY|DONT)WAIT */
|
||||
mac_init_label(&m->m_pkthdr.label);
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, how);
|
||||
|
||||
MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag);
|
||||
#ifdef MAC_DEBUG
|
||||
atomic_add_int(&nmacmbufs, 1);
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue