[PATCH] ieee80211: Mixed PTK/GTK CCMP/TKIP support

tree 5c7559a1216ae1121487f6aed94a6017490729b3
parent c1ff4c22e5622c8987bf96c09158c4924cde98c2
author Hong Liu <hong.liu@intel.com> 1125482767 +0800
committer James Ketrenos <jketreno@linux.intel.com> 1127314427 -0500

Mixed PTK/GTK CCMP/TKIP support.

Signed-off-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 8bcdbabae3a1..65315bcd6e0a 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -409,7 +409,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                 return 1;
         }
 
-        if (ieee->host_decrypt) {
+        if (is_multicast_ether_addr(hdr->addr1) ? ieee->host_mc_decrypt :
+            ieee->host_decrypt) {
                 int idx = 0;
                 if (skb->len >= hdrlen + 3)
                         idx = skb->data[hdrlen + 3] >> 6;
@@ -1066,7 +1067,7 @@ static inline int ieee80211_network_init(struct ieee80211_device *ieee, struct i
         network->flags = 0;
         network->atim_window = 0;
         network->erp_value = (network->capability & WLAN_CAPABILITY_IBSS) ?
-                0x3 : 0x0;
+            0x3 : 0x0;
 
         if (stats->freq == IEEE80211_52GHZ_BAND) {
                 /* for A band (No DS info) */