| Message ID | 1359389513-1554-1-git-send-email-sven@narfation.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index a190895..d412fd0 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1160,7 +1160,9 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) if (rx->key && rx->key->conf.cipher != WLAN_CIPHER_SUITE_WEP40 && rx->key->conf.cipher != WLAN_CIPHER_SUITE_WEP104 && - !is_multicast_ether_addr(hdr->addr1)) + !is_multicast_ether_addr(hdr->addr1) && + (rx->sdata->vif.type != NL80211_IFTYPE_ADHOC || + rx->sdata->u.ibss.control_port)) rx->key = NULL; } }
WPA_NONE uses the shared group key to encrypt the protected frames. Therefore, it must also be allowed for non-multicast frames to use the group key for decryption. Signed-off-by: Sven Eckelmann <sven@narfation.org> --- net/mac80211/rx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)