summaryrefslogtreecommitdiff
path: root/sys/net80211
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2015-02-09 03:09:58 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2015-02-09 03:09:58 +0000
commitb0353336ff6ce726e4e5366de313c7cbf62de3c1 (patch)
treefd9f6697d602f010faef8ab7cea36876d97858f0 /sys/net80211
parenta25e352d6018713d381fa67714bda8e417e30715 (diff)
tweak the new if_input function so it takes an mbuf_list instead
of a single mbuf. this forces us to batch work between the hardware rx handlers and the stack. this includes a converstion of bge from ether_input to if_input. ok claudio@ pelikan@ mpi@
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_input.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 2a47c8a2ad4..fb1842dfdca 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_input.c,v 1.131 2015/02/08 06:03:07 mpi Exp $ */
+/* $OpenBSD: ieee80211_input.c,v 1.132 2015/02/09 03:09:57 dlg Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
@@ -870,8 +870,11 @@ ieee80211_deliver_data(struct ieee80211com *ic, struct mbuf *m,
bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_IN);
#endif
ieee80211_eapol_key_input(ic, m, ni);
- } else
- if_input(ifp, m);
+ } else {
+ struct mbuf_list ml = MBUF_LIST_INITIALIZER();
+ ml_enqueue(&ml, m);
+ if_input(ifp, &ml);
+ }
}
}