diff options
| author | glebius <glebius@FreeBSD.org> | 2012-12-05 08:04:20 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2012-12-05 08:04:20 +0000 |
| commit | 8e20fa5ae93243e19700ca06c01524b90fe3b784 (patch) | |
| tree | bf083a0829f8044362fc83354c8e8b60d1f7932a /sys/netatalk/aarp.c | |
| parent | d0604243f84872a5dd39fc735ebcdb4fbe1b6bb5 (diff) | |
| download | FreeBSD-src-8e20fa5ae93243e19700ca06c01524b90fe3b784.zip FreeBSD-src-8e20fa5ae93243e19700ca06c01524b90fe3b784.tar.gz | |
Mechanically substitute flags from historic mbuf allocator with
malloc(9) flags within sys.
Exceptions:
- sys/contrib not touched
- sys/mbuf.h edited manually
Diffstat (limited to 'sys/netatalk/aarp.c')
| -rw-r--r-- | sys/netatalk/aarp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c index 7e340de..4426d57 100644 --- a/sys/netatalk/aarp.c +++ b/sys/netatalk/aarp.c @@ -190,7 +190,7 @@ aarpwhohas(struct ifnet *ifp, struct sockaddr_at *sat) struct sockaddr sa; AARPTAB_UNLOCK_ASSERT(); - m = m_gethdr(M_DONTWAIT, MT_DATA); + m = m_gethdr(M_NOWAIT, MT_DATA); if (m == NULL) return; #ifdef MAC @@ -230,7 +230,7 @@ aarpwhohas(struct ifnet *ifp, struct sockaddr_at *sat) sizeof(eh->ether_dhost)); eh->ether_type = htons(sizeof(struct llc) + sizeof(struct ether_aarp)); - M_PREPEND(m, sizeof(struct llc), M_DONTWAIT); + M_PREPEND(m, sizeof(struct llc), M_NOWAIT); if (m == NULL) { ifa_free(&aa->aa_ifa); return; @@ -524,7 +524,7 @@ at_aarpinput(struct ifnet *ifp, struct mbuf *m) if (aa->aa_flags & AFA_PHASE2) { eh->ether_type = htons(sizeof(struct llc) + sizeof(struct ether_aarp)); - M_PREPEND(m, sizeof(struct llc), M_DONTWAIT); + M_PREPEND(m, sizeof(struct llc), M_NOWAIT); if (m == NULL) { ifa_free(&aa->aa_ifa); return; @@ -643,7 +643,7 @@ aarpprobe(void *arg) ifa_ref(&aa->aa_ifa); AARPTAB_UNLOCK(); - m = m_gethdr(M_DONTWAIT, MT_DATA); + m = m_gethdr(M_NOWAIT, MT_DATA); if (m == NULL) { ifa_free(&aa->aa_ifa); return; @@ -673,7 +673,7 @@ aarpprobe(void *arg) sizeof(eh->ether_dhost)); eh->ether_type = htons(sizeof(struct llc) + sizeof(struct ether_aarp)); - M_PREPEND(m, sizeof(struct llc), M_WAIT); + M_PREPEND(m, sizeof(struct llc), M_WAITOK); llc = mtod(m, struct llc *); llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP; llc->llc_control = LLC_UI; |
