summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/acx.c32
-rw-r--r--sys/dev/ic/ath.c19
-rw-r--r--sys/dev/ic/bwi.c33
-rw-r--r--sys/dev/pci/hifn7751.c19
-rw-r--r--sys/dev/pci/if_age.c29
-rw-r--r--sys/dev/pci/if_alc.c29
-rw-r--r--sys/dev/pci/if_ale.c29
-rw-r--r--sys/dev/pci/if_et.c31
-rw-r--r--sys/dev/pci/if_jme.c29
-rw-r--r--sys/dev/pci/safe.c11
-rw-r--r--sys/dev/pci/ubsec.c11
11 files changed, 46 insertions, 226 deletions
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 693923cbfa3..2f9fe36b098 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acx.c,v 1.94 2009/07/28 11:39:52 blambert Exp $ */
+/* $OpenBSD: acx.c,v 1.95 2009/09/13 14:42:52 krw Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -2222,38 +2222,10 @@ acx_encap(struct acx_softc *sc, struct acx_txbuf *txbuf, struct mbuf *m,
if (error) { /* error == EFBIG */
/* too many fragments, linearize */
- struct mbuf *mnew;
-
- error = 0;
-
- MGETHDR(mnew, M_DONTWAIT, MT_DATA);
- if (mnew == NULL) {
- m_freem(m);
- error = ENOBUFS;
+ if (m_defrag(m, M_DONTWAIT)) {
printf("%s: can't defrag tx mbuf\n", ifp->if_xname);
goto back;
}
-
- M_DUP_PKTHDR(mnew, m);
- if (m->m_pkthdr.len > MHLEN) {
- MCLGET(mnew, M_DONTWAIT);
- if (!(mnew->m_flags & M_EXT)) {
- m_freem(m);
- m_freem(mnew);
- error = ENOBUFS;
- }
- }
-
- if (error) {
- printf("%s: can't defrag tx mbuf\n", ifp->if_xname);
- goto back;
- }
-
- m_copydata(m, 0, m->m_pkthdr.len, mtod(mnew, caddr_t));
- m_freem(m);
- mnew->m_len = mnew->m_pkthdr.len;
- m = mnew;
-
error = bus_dmamap_load_mbuf(sc->sc_dmat,
txbuf->tb_mbuf_dmamap, m, BUS_DMA_NOWAIT);
if (error) {
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 20376840e92..9fbd8940ecb 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ath.c,v 1.82 2009/08/10 20:29:54 deraadt Exp $ */
+/* $OpenBSD: ath.c,v 1.83 2009/09/13 14:42:52 krw Exp $ */
/* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */
/*-
@@ -2135,7 +2135,6 @@ ath_tx_start(struct ath_softc *sc, struct ieee80211_node *ni,
int i, error, iswep, hdrlen, pktlen, len, s;
u_int8_t rix, cix, txrate, ctsrate;
struct ath_desc *ds;
- struct mbuf *m;
struct ieee80211_frame *wh;
struct ieee80211_key *k;
u_int32_t iv;
@@ -2238,25 +2237,11 @@ ath_tx_start(struct ath_softc *sc, struct ieee80211_node *ni,
*/
if (error == EFBIG) { /* too many desc's, linearize */
sc->sc_stats.ast_tx_linear++;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
- if (m == NULL) {
- sc->sc_stats.ast_tx_nombuf++;
- m_freem(m0);
- return ENOMEM;
- }
-
- M_DUP_PKTHDR(m, m0);
- MCLGET(m, M_DONTWAIT);
- if ((m->m_flags & M_EXT) == 0) {
+ if (m_defrag(m0, M_DONTWAIT)) {
sc->sc_stats.ast_tx_nomcl++;
m_freem(m0);
- m_free(m);
return ENOMEM;
}
- m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, caddr_t));
- m_freem(m0);
- m->m_len = m->m_pkthdr.len;
- m0 = m;
error = bus_dmamap_load_mbuf(sc->sc_dmat, bf->bf_dmamap, m0,
BUS_DMA_NOWAIT);
if (error != 0) {
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 027b20d03ff..b4115985ad8 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwi.c,v 1.90 2009/08/02 19:33:01 blambert Exp $ */
+/* $OpenBSD: bwi.c,v 1.91 2009/09/13 14:42:52 krw Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -8849,40 +8849,11 @@ bwi_encap(struct bwi_softc *sc, int idx, struct mbuf *m,
}
if (error) { /* error == EFBIG */
- struct mbuf *m_new;
-
- error = 0;
-
- MGETHDR(m_new, M_DONTWAIT, MT_DATA);
- if (m_new == NULL) {
- m_freem(m);
- error = ENOBUFS;
+ if (m_defrag(m, M_DONTWAIT)) {
printf("%s: can't defrag TX buffer\n",
sc->sc_dev.dv_xname);
goto back;
}
-
- M_DUP_PKTHDR(m_new, m);
- if (m->m_pkthdr.len > MHLEN) {
- MCLGET(m_new, M_DONTWAIT);
- if (!(m_new->m_flags & M_EXT)) {
- m_freem(m);
- m_freem(m_new);
- error = ENOBUFS;
- }
- }
-
- if (error) {
- printf("%s: can't defrag TX buffer\n",
- sc->sc_dev.dv_xname);
- goto back;
- }
-
- m_copydata(m, 0, m->m_pkthdr.len, mtod(m_new, caddr_t));
- m_freem(m);
- m_new->m_len = m_new->m_pkthdr.len;
- m = m_new;
-
error = bus_dmamap_load_mbuf(sc->sc_dmat, tb->tb_dmap, m,
BUS_DMA_NOWAIT);
if (error) {
diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index eca6ee5a872..660c6be6ef3 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hifn7751.c,v 1.157 2008/09/25 17:55:28 chl Exp $ */
+/* $OpenBSD: hifn7751.c,v 1.158 2009/09/13 14:42:52 krw Exp $ */
/*
* Invertex AEON / Hifn 7751 driver
@@ -1429,8 +1429,13 @@ hifn_crypto(struct hifn_softc *sc, struct hifn_command *cmd,
err = ENOMEM;
goto err_srcmap;
}
- if (len == MHLEN)
- M_DUP_PKTHDR(m0, cmd->srcu.src_m);
+ if (len == MHLEN) {
+ err = m_dup_pkthdr(m0, cmd->srcu.src_m);
+ if (err) {
+ m_free(m0);
+ goto err_srcmap;
+ }
+ }
if (totlen >= MINCLSIZE) {
MCLGET(m0, M_DONTWAIT);
if (m0->m_flags & M_EXT)
@@ -2752,8 +2757,12 @@ hifn_mkmbuf_chain(int totlen, struct mbuf *mtemplate)
}
if (m0 == NULL)
return (NULL);
- if (len == MHLEN)
- M_DUP_PKTHDR(m0, mtemplate);
+ if (len == MHLEN) {
+ if (m_dup_pkthdr(m0, mtemplate)) {
+ m_free(m0);
+ return (NULL);
+ }
+ }
MCLGET(m0, M_DONTWAIT);
if (!(m0->m_flags & M_EXT))
m_freem(m0);
diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index 523c8d2d799..a0b51596af4 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_age.c,v 1.6 2009/07/28 13:53:56 kevlo Exp $ */
+/* $OpenBSD: if_age.c,v 1.7 2009/09/13 14:42:52 krw Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -1168,43 +1168,18 @@ age_encap(struct age_softc *sc, struct mbuf **m_head)
error = EFBIG;
}
if (error == EFBIG) {
- error = 0;
-
- MGETHDR(m, M_DONTWAIT, MT_DATA);
- if (m == NULL) {
+ if (m_defrag(*m_head, M_DONTWAIT)) {
printf("%s: can't defrag TX mbuf\n",
sc->sc_dev.dv_xname);
m_freem(*m_head);
*m_head = NULL;
return (ENOBUFS);
}
-
- M_DUP_PKTHDR(m, *m_head);
- if ((*m_head)->m_pkthdr.len > MHLEN) {
- MCLGET(m, M_DONTWAIT);
- if (!(m->m_flags & M_EXT)) {
- m_freem(*m_head);
- m_freem(m);
- *m_head = NULL;
- return (ENOBUFS);
- }
- }
- m_copydata(*m_head, 0, (*m_head)->m_pkthdr.len,
- mtod(m, caddr_t));
- m_freem(*m_head);
- m->m_len = m->m_pkthdr.len;
- *m_head = m;
-
error = bus_dmamap_load_mbuf(sc->sc_dmat, map, *m_head,
BUS_DMA_NOWAIT);
-
if (error != 0) {
printf("%s: could not load defragged TX mbuf\n",
sc->sc_dev.dv_xname);
- if (!error) {
- bus_dmamap_unload(sc->sc_dmat, map);
- error = EFBIG;
- }
m_freem(*m_head);
*m_head = NULL;
return (error);
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index 6f36b086e56..d1987c050fd 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $ */
+/* $OpenBSD: if_alc.c,v 1.2 2009/09/13 14:42:52 krw Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -1024,43 +1024,18 @@ alc_encap(struct alc_softc *sc, struct mbuf **m_head)
error = EFBIG;
}
if (error == EFBIG) {
- error = 0;
-
- MGETHDR(m, M_DONTWAIT, MT_DATA);
- if (m == NULL) {
+ if (m_defrag(*m_head, M_DONTWAIT)) {
printf("%s: can't defrag TX mbuf\n",
sc->sc_dev.dv_xname);
m_freem(*m_head);
*m_head = NULL;
return (ENOBUFS);
}
-
- M_DUP_PKTHDR(m, *m_head);
- if ((*m_head)->m_pkthdr.len > MHLEN) {
- MCLGET(m, M_DONTWAIT);
- if (!(m->m_flags & M_EXT)) {
- m_freem(*m_head);
- m_freem(m);
- *m_head = NULL;
- return (ENOBUFS);
- }
- }
- m_copydata(*m_head, 0, (*m_head)->m_pkthdr.len,
- mtod(m, caddr_t));
- m_freem(*m_head);
- m->m_len = m->m_pkthdr.len;
- *m_head = m;
-
error = bus_dmamap_load_mbuf(sc->sc_dmat, map, *m_head,
BUS_DMA_NOWAIT);
-
if (error != 0) {
printf("%s: could not load defragged TX mbuf\n",
sc->sc_dev.dv_xname);
- if (!error) {
- bus_dmamap_unload(sc->sc_dmat, map);
- error = EFBIG;
- }
m_freem(*m_head);
*m_head = NULL;
return (error);
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index e0f1b11d308..abf811510d1 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ale.c,v 1.8 2009/08/09 03:03:19 kevlo Exp $ */
+/* $OpenBSD: if_ale.c,v 1.9 2009/09/13 14:42:52 krw Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -889,43 +889,18 @@ ale_encap(struct ale_softc *sc, struct mbuf **m_head)
error = EFBIG;
}
if (error == EFBIG) {
- error = 0;
-
- MGETHDR(m, M_DONTWAIT, MT_DATA);
- if (m == NULL) {
+ if (m_defrag(*m_head, M_DONTWAIT)) {
printf("%s: can't defrag TX mbuf\n",
sc->sc_dev.dv_xname);
m_freem(*m_head);
*m_head = NULL;
return (ENOBUFS);
}
-
- M_DUP_PKTHDR(m, *m_head);
- if ((*m_head)->m_pkthdr.len > MHLEN) {
- MCLGET(m, M_DONTWAIT);
- if (!(m->m_flags & M_EXT)) {
- m_freem(*m_head);
- m_freem(m);
- *m_head = NULL;
- return (ENOBUFS);
- }
- }
- m_copydata(*m_head, 0, (*m_head)->m_pkthdr.len,
- mtod(m, caddr_t));
- m_freem(*m_head);
- m->m_len = m->m_pkthdr.len;
- *m_head = m;
-
error = bus_dmamap_load_mbuf(sc->sc_dmat, map, *m_head,
BUS_DMA_NOWAIT);
-
if (error != 0) {
printf("%s: could not load defragged TX mbuf\n",
sc->sc_dev.dv_xname);
- if (!error) {
- bus_dmamap_unload(sc->sc_dmat, map);
- error = EFBIG;
- }
m_freem(*m_head);
*m_head = NULL;
return (error);
diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c
index 21d630f8c7e..654783c715b 100644
--- a/sys/dev/pci/if_et.c
+++ b/sys/dev/pci/if_et.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_et.c,v 1.18 2009/08/10 19:41:05 deraadt Exp $ */
+/* $OpenBSD: if_et.c,v 1.19 2009/09/13 14:42:52 krw Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
@@ -1823,40 +1823,13 @@ et_encap(struct et_softc *sc, struct mbuf **m0)
goto back;
}
if (error) { /* error == EFBIG */
- struct mbuf *m_new;
-
- error = 0;
-
- MGETHDR(m_new, M_DONTWAIT, MT_DATA);
- if (m_new == NULL) {
+ if (m_defrag(m, M_DONTWAIT)) {
m_freem(m);
printf("%s: can't defrag TX mbuf\n",
sc->sc_dev.dv_xname);
error = ENOBUFS;
goto back;
}
-
- M_DUP_PKTHDR(m_new, m);
- if (m->m_pkthdr.len > MHLEN) {
- MCLGET(m_new, M_DONTWAIT);
- if (!(m_new->m_flags & M_EXT)) {
- m_freem(m);
- m_freem(m_new);
- error = ENOBUFS;
- }
- }
-
- if (error) {
- printf("%s: can't defrag TX buffer\n",
- sc->sc_dev.dv_xname);
- goto back;
- }
-
- m_copydata(m, 0, m->m_pkthdr.len, mtod(m_new, caddr_t));
- m_freem(m);
- m_new->m_len = m_new->m_pkthdr.len;
- *m0 = m = m_new;
-
error = bus_dmamap_load_mbuf(sc->sc_dmat, map, m,
BUS_DMA_NOWAIT);
if (error || map->dm_nsegs == 0) {
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index 08ef0fee257..57a2d3a7765 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_jme.c,v 1.19 2009/06/05 06:05:06 naddy Exp $ */
+/* $OpenBSD: if_jme.c,v 1.20 2009/09/13 14:42:52 krw Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -1084,44 +1084,19 @@ jme_encap(struct jme_softc *sc, struct mbuf **m_head)
error = EFBIG;
}
if (error == EFBIG) {
- error = 0;
-
- MGETHDR(m, M_DONTWAIT, MT_DATA);
- if (m == NULL) {
+ if (m_defrag(*m_head, M_DONTWAIT)) {
printf("%s: can't defrag TX mbuf\n",
sc->sc_dev.dv_xname);
m_freem(*m_head);
*m_head = NULL;
return (ENOBUFS);
}
-
- M_DUP_PKTHDR(m, *m_head);
- if ((*m_head)->m_pkthdr.len > MHLEN) {
- MCLGET(m, M_DONTWAIT);
- if (!(m->m_flags & M_EXT)) {
- m_freem(*m_head);
- m_freem(m);
- *m_head = NULL;
- return (ENOBUFS);
- }
- }
-
- m_copydata(*m_head, 0, (*m_head)->m_pkthdr.len, mtod(m, caddr_t));
- m_freem(*m_head);
- m->m_len = m->m_pkthdr.len;
- *m_head = m;
-
error = bus_dmamap_load_mbuf(sc->sc_dmat,
txd->tx_dmamap, *m_head,
BUS_DMA_NOWAIT);
if (error != 0) {
printf("%s: could not load defragged TX mbuf\n",
sc->sc_dev.dv_xname);
- if (!error) {
- bus_dmamap_unload(sc->sc_dmat,
- txd->tx_dmamap);
- error = EFBIG;
- }
m_freem(*m_head);
*m_head = NULL;
return (error);
diff --git a/sys/dev/pci/safe.c b/sys/dev/pci/safe.c
index afcaca04708..62fff55053c 100644
--- a/sys/dev/pci/safe.c
+++ b/sys/dev/pci/safe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: safe.c,v 1.25 2009/06/25 10:14:48 jsg Exp $ */
+/* $OpenBSD: safe.c,v 1.26 2009/09/13 14:42:52 krw Exp $ */
/*-
* Copyright (c) 2003 Sam Leffler, Errno Consulting
@@ -806,8 +806,13 @@ safe_process(struct cryptop *crp)
err = sc->sc_nqchip ? ERESTART : ENOMEM;
goto errout;
}
- if (len == MHLEN)
- M_DUP_PKTHDR(m, re->re_src_m);
+ if (len == MHLEN) {
+ err = m_dup_pkthdr(m, re->re_src_m);
+ if (err) {
+ m_free(m);
+ goto errout;
+ }
+ }
if (totlen >= MINCLSIZE) {
MCLGET(m, M_DONTWAIT);
if ((m->m_flags & M_EXT) == 0) {
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index a53469ce500..08ab6c98db9 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsec.c,v 1.143 2009/03/27 13:31:30 reyk Exp $ */
+/* $OpenBSD: ubsec.c,v 1.144 2009/09/13 14:42:52 krw Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -1159,8 +1159,13 @@ ubsec_process(struct cryptop *crp)
err = ENOMEM;
goto errout;
}
- if (len == MHLEN)
- M_DUP_PKTHDR(m, q->q_src_m);
+ if (len == MHLEN) {
+ err = m_dup_pkthdr(m, q->q_src_m);
+ if (err) {
+ m_freem(m);
+ goto errout;
+ }
+ }
if (totlen >= MINCLSIZE) {
MCLGET(m, M_DONTWAIT);
if (m->m_flags & M_EXT)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 05:52:19 +0000