summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstsp <stsp@openbsd.org>2016-02-11 19:36:48 +0000
committerstsp <stsp@openbsd.org>2016-02-11 19:36:48 +0000
commit83c6196de297d32c497b2af13debef870671cd6b (patch)
tree5c5b5aecfa3f8a4b519e43eb6a089e35bf4979a7
parentBack out previous; requested by jung@ (diff)
downloadwireguard-openbsd-83c6196de297d32c497b2af13debef870671cd6b.tar.xz
wireguard-openbsd-83c6196de297d32c497b2af13debef870671cd6b.zip
In ieee80211_input(), initialize 'subtype' variable before using it.
Should have been part of the QoS "no data" fix. ok tb@
-rw-r--r--sys/net80211/ieee80211_input.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 237c8a5d201..276f4f48749 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_input.c,v 1.166 2016/02/11 17:14:29 stsp Exp $ */
+/* $OpenBSD: ieee80211_input.c,v 1.167 2016/02/11 19:36:48 stsp Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
@@ -257,6 +257,7 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni,
dir = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK;
type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
+ subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
if (type != IEEE80211_FC0_TYPE_CTL) {
hdrlen = ieee80211_get_hdrlen(wh);