4 files changed, 18 insertions, 5 deletions

diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 931737eec6c6..ef85a96fce49 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -851,6 +851,9 @@ struct ieee80211_device {
         int host_encrypt;
         int host_encrypt_msdu;
         int host_decrypt;
+        /* host performs multicast decryption */
+        int host_mc_decrypt;
+
         int host_open_frag;
         int ieee802_1x;         /* is IEEE 802.1X used */
 
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index dddc61647390..941f1a13fafa 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -133,6 +133,8 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
         /* Default to enabling full open WEP with host based encrypt/decrypt */
         ieee->host_encrypt = 1;
         ieee->host_decrypt = 1;
+        ieee->host_mc_decrypt = 1;
+
         /* Host fragementation in Open mode. Default is enabled.
          * Note: host fragmentation is always enabled if host encryption
          * is enabled. For cards can do hardware encryption, they must do
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) */
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index db66217699d5..d710f47c4bd5 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -493,6 +493,7 @@ int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
         struct iw_point *encoding = &wrqu->encoding;
         struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
         int i, idx, ret = 0;
+        int group_key = 0;
         const char *alg, *module;
         struct ieee80211_crypto_ops *ops;
         struct ieee80211_crypt_data **crypt;
@@ -509,9 +510,10 @@ int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
         } else
                 idx = ieee->tx_keyidx;
 
-        if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY)
+        if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
                 crypt = &ieee->crypt[idx];
-        else {
+                group_key = 1;
+        } else {
                 if (idx != 0)
                         return -EINVAL;
                 if (ieee->iw_mode == IW_MODE_INFRA)
@@ -542,7 +544,9 @@ int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
         sec.enabled = 1;
         sec.encrypt = 1;
 
-        if (!(ieee->host_encrypt || ieee->host_decrypt))
+        if (group_key ? !ieee->host_mc_decrypt :
+            !(ieee->host_encrypt || ieee->host_decrypt ||
+              ieee->host_encrypt_msdu))
                 goto skip_host_crypt;
 
         switch (ext->alg) {
@@ -632,6 +636,9 @@ int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
                         sec.flags |= SEC_LEVEL;
                         sec.level = SEC_LEVEL_3;
                 }
+                /* Don't set sec level for group keys. */
+                if (group_key)
+                        sec.flags &= ~SEC_LEVEL;
         }
       done:
         if (ieee->set_security)