summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@openbsd.org>2008-12-22 18:20:47 +0000
committerdamien <damien@openbsd.org>2008-12-22 18:20:47 +0000
commit003d0bcf8919aa94d15b658c37954caab450e65c (patch)
treeba02fc317dd87066851f97a75b31214933a5d8fd
parentIf we ever get an interrupt from userland with %otherwin set, we have a serious (diff)
downloadwireguard-openbsd-003d0bcf8919aa94d15b658c37954caab450e65c.tar.xz
wireguard-openbsd-003d0bcf8919aa94d15b658c37954caab450e65c.zip
I swapped MGETHDR arguments in my m_defrag removal commit.
-rw-r--r--sys/dev/ic/rt2560.c4
-rw-r--r--sys/dev/ic/rt2661.c4
-rw-r--r--sys/dev/ic/rt2860.c4
-rw-r--r--sys/dev/pci/if_ipw.c4
-rw-r--r--sys/dev/pci/if_iwi.c4
-rw-r--r--sys/dev/pci/if_iwn.c4
-rw-r--r--sys/dev/pci/if_wpi.c4
7 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index e24147275e5..7fc917a5dc1 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2560.c,v 1.41 2008/12/21 18:19:58 damien Exp $ */
+/* $OpenBSD: rt2560.c,v 1.42 2008/12/22 18:20:47 damien Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -1828,7 +1828,7 @@ rt2560_tx_data(struct rt2560_softc *sc, struct mbuf *m0,
}
if (error != 0) {
/* too many fragments, linearize */
- MGETHDR(m1, MT_DATA, M_DONTWAIT);
+ MGETHDR(m1, M_DONTWAIT, MT_DATA);
if (m1 == NULL) {
m_freem(m0);
return ENOBUFS;
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index b146edefd82..d8a59e8adbe 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2661.c,v 1.46 2008/12/21 18:19:58 damien Exp $ */
+/* $OpenBSD: rt2661.c,v 1.47 2008/12/22 18:20:47 damien Exp $ */
/*-
* Copyright (c) 2006
@@ -1672,7 +1672,7 @@ rt2661_tx_data(struct rt2661_softc *sc, struct mbuf *m0,
}
if (error != 0) {
/* too many fragments, linearize */
- MGETHDR(m1, MT_DATA, M_DONTWAIT);
+ MGETHDR(m1, M_DONTWAIT, MT_DATA);
if (m1 == NULL) {
m_freem(m0);
return ENOBUFS;
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index a9b17915a59..7cf1ca39e3f 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2860.c,v 1.28 2008/12/21 18:19:58 damien Exp $ */
+/* $OpenBSD: rt2860.c,v 1.29 2008/12/22 18:20:47 damien Exp $ */
/*-
* Copyright (c) 2007, 2008
@@ -1501,7 +1501,7 @@ rt2860_tx(struct rt2860_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
}
if (__predict_false(error != 0)) {
/* too many fragments, linearize */
- MGETHDR(m1, MT_DATA, M_DONTWAIT);
+ MGETHDR(m1, M_DONTWAIT, MT_DATA);
if (m1 == NULL) {
m_freem(m);
return ENOBUFS;
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 45c7b33b141..402052accd6 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ipw.c,v 1.82 2008/12/21 18:19:58 damien Exp $ */
+/* $OpenBSD: if_ipw.c,v 1.83 2008/12/22 18:20:47 damien Exp $ */
/*-
* Copyright (c) 2004-2008
@@ -1192,7 +1192,7 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni)
}
if (error != 0) {
/* too many fragments, linearize */
- MGETHDR(m1, MT_DATA, M_DONTWAIT);
+ MGETHDR(m1, M_DONTWAIT, MT_DATA);
if (m1 == NULL) {
m_freem(m);
return ENOBUFS;
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index c6d9986a66a..145ccaceb9d 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwi.c,v 1.97 2008/12/21 18:19:58 damien Exp $ */
+/* $OpenBSD: if_iwi.c,v 1.98 2008/12/22 18:20:47 damien Exp $ */
/*-
* Copyright (c) 2004-2008
@@ -1300,7 +1300,7 @@ iwi_tx_start(struct ifnet *ifp, struct mbuf *m0, struct ieee80211_node *ni)
}
if (error != 0) {
/* too many fragments, linearize */
- MGETHDR(m1, MT_DATA, M_DONTWAIT);
+ MGETHDR(m1, M_DONTWAIT, MT_DATA);
if (m1 == NULL) {
m_freem(m0);
return ENOBUFS;
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index e7f8a44b7a8..23074007fea 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwn.c,v 1.44 2008/12/21 18:19:58 damien Exp $ */
+/* $OpenBSD: if_iwn.c,v 1.45 2008/12/22 18:20:47 damien Exp $ */
/*-
* Copyright (c) 2007, 2008
@@ -2583,7 +2583,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
}
if (error != 0) {
/* Too many DMA segments, linearize mbuf. */
- MGETHDR(m1, MT_DATA, M_DONTWAIT);
+ MGETHDR(m1, M_DONTWAIT, MT_DATA);
if (m1 == NULL) {
m_freem(m);
return ENOBUFS;
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index 3fed5f6112e..1af5776d5b6 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wpi.c,v 1.79 2008/12/21 18:19:58 damien Exp $ */
+/* $OpenBSD: if_wpi.c,v 1.80 2008/12/22 18:20:47 damien Exp $ */
/*-
* Copyright (c) 2006-2008
@@ -1866,7 +1866,7 @@ wpi_tx(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
}
if (error != 0) {
/* Too many DMA segments, linearize mbuf. */
- MGETHDR(m1, MT_DATA, M_DONTWAIT);
+ MGETHDR(m1, M_DONTWAIT, MT_DATA);
if (m1 == NULL) {
m_freem(m);
return ENOBUFS;