diff options
| author | Bret Lambert <blambert@cvs.openbsd.org> | 2011-05-04 16:05:50 +0000 |
|---|---|---|
| committer | Bret Lambert <blambert@cvs.openbsd.org> | 2011-05-04 16:05:50 +0000 |
| commit | 5f848fb5f2f55c199db2de8dfe5d9e5ef6c8ff11 (patch) | |
| tree | bca9d9b5c4ab3e082c07cc2014c2ccb94db8ad27 /sys/net80211/ieee80211_pae_input.c | |
| parent | 59a218178fb54575bf5b30819c39cb1f242e2b65 (diff) | |
Collapse m_pullup and m_pullup2 into a single function, as they're
essentially identical; the only difference being that m_pullup2 is
capable of handling mbuf clusters, but called m_pullup for shorter
lengths (!).
testing dlg@ ok claudio@
Diffstat (limited to 'sys/net80211/ieee80211_pae_input.c')
| -rw-r--r-- | sys/net80211/ieee80211_pae_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_pae_input.c b/sys/net80211/ieee80211_pae_input.c index 9d97d72bbfb..3dfcbce8fe7 100644 --- a/sys/net80211/ieee80211_pae_input.c +++ b/sys/net80211/ieee80211_pae_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_pae_input.c,v 1.17 2010/02/06 15:16:27 jcs Exp $ */ +/* $OpenBSD: ieee80211_pae_input.c,v 1.18 2011/05/04 16:05:49 blambert Exp $ */ /*- * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr> @@ -141,7 +141,7 @@ ieee80211_eapol_key_input(struct ieee80211com *ic, struct mbuf *m, } /* make sure the key data field is contiguous */ - if (m->m_len < totlen && (m = m_pullup2(m, totlen)) == NULL) { + if (m->m_len < totlen && (m = m_pullup(m, totlen)) == NULL) { ic->ic_stats.is_rx_nombuf++; goto done; } |