summaryrefslogtreecommitdiff
path: root/sys/net80211
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2008-08-12 20:07:14 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2008-08-12 20:07:14 +0000
commita8fc02827e8d7a2f0c6b2a94fbcec20152cfaf0e (patch)
tree64312ed07fbaaa439ffe1acae8a0563736841456 /sys/net80211
parentef67c974f95cf8e5d00f191ee960b6399a48f9e1 (diff)
adopt the integrity group cipher of the AP at association time.
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_input.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 99980cc00a8..151a722eeb2 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_input.c,v 1.96 2008/08/12 19:56:59 damien Exp $ */
+/* $OpenBSD: ieee80211_input.c,v 1.97 2008/08/12 20:07:13 damien Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
@@ -1605,6 +1605,7 @@ ieee80211_recv_assoc_req(struct ieee80211com *ic, struct mbuf *m0,
ni->ni_rsnakms = rsn.rsn_akms;
ni->ni_rsnciphers = rsn.rsn_ciphers;
ni->ni_rsngroupcipher = ic->ic_bss->ni_rsngroupcipher;
+ ni->ni_rsngroupmgmtcipher = ic->ic_bss->ni_rsngroupmgmtcipher;
ni->ni_rsncaps = rsn.rsn_caps;
} else
ni->ni_rsnprotos = IEEE80211_PROTO_NONE;
@@ -1958,6 +1959,9 @@ ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0,
}
}
+/*
+ * Process an incoming PS-Poll control frame (see 11.2).
+ */
void
ieee80211_recv_pspoll(struct ieee80211com *ic, struct mbuf *m,
struct ieee80211_node *ni)