diff options
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 4 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 8538f6ea940..cd507a42539 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,5 +1,5 @@ /* $NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $ */ -/* $OpenBSD: ieee80211_input.c,v 1.45 2007/07/28 11:24:06 damien Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.46 2007/08/01 11:59:40 damien Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting @@ -902,7 +902,7 @@ ieee80211_parse_rsn_cipher(const u_int8_t selector[4]) return IEEE80211_CIPHER_WEP40; case 2: /* TKIP */ return IEEE80211_CIPHER_TKIP; - case 3: /* CCMP (RSNA default) */ + case 4: /* CCMP (RSNA default) */ return IEEE80211_CIPHER_CCMP; case 5: /* WEP-104 */ return IEEE80211_CIPHER_WEP104; diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index fe9f184b7f6..c8ee20719c6 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_output.c,v 1.48 2007/07/28 11:24:06 damien Exp $ */ +/* $OpenBSD: ieee80211_output.c,v 1.49 2007/08/01 11:59:40 damien Exp $ */ /* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */ /*- @@ -837,7 +837,7 @@ ieee80211_add_rsn_body(u_int8_t *frm, struct ieee80211com *ic, *frm++ = 2; break; case IEEE80211_CIPHER_CCMP: - *frm++ = 3; + *frm++ = 4; break; case IEEE80211_CIPHER_WEP104: *frm++ = 5; @@ -859,7 +859,7 @@ ieee80211_add_rsn_body(u_int8_t *frm, struct ieee80211com *ic, } if (ni->ni_pairwise_cipherset & IEEE80211_CIPHER_CCMP) { memcpy(frm, oui, 3); frm += 3; - *frm++ = 3; + *frm++ = 4; count++; } /* write Pairwise Cipher Suite Count field */ |