5 files changed, 34 insertions, 3 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 6464bfd232c9..77e9ff5ec4f3 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -141,7 +141,8 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
                 return -EINVAL;
         }
 
-        key = ieee80211_key_alloc(alg, key_idx, params->key_len, params->key);
+        key = ieee80211_key_alloc(alg, key_idx, params->key_len, params->key,
+                                  params->seq_len, params->seq);
         if (!key)
                 return -ENOMEM;
 
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index b7e1350273bb..827ea8e6ee0a 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -290,9 +290,11 @@ static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
 struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg,
                                           int idx,
                                           size_t key_len,
-                                          const u8 *key_data)
+                                          const u8 *key_data,
+                                          size_t seq_len, const u8 *seq)
 {
         struct ieee80211_key *key;
+        int i, j;
 
         BUG_ON(idx < 0 || idx >= NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS);
 
@@ -318,14 +320,31 @@ struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg,
         case ALG_TKIP:
                 key->conf.iv_len = TKIP_IV_LEN;
                 key->conf.icv_len = TKIP_ICV_LEN;
+                if (seq && seq_len == 6) {
+                        for (i = 0; i < NUM_RX_DATA_QUEUES; i++) {
+                                key->u.tkip.rx[i].iv32 =
+                                        get_unaligned_le32(&seq[2]);
+                                key->u.tkip.rx[i].iv16 =
+                                        get_unaligned_le16(seq);
+                        }
+                }
                 break;
         case ALG_CCMP:
                 key->conf.iv_len = CCMP_HDR_LEN;
                 key->conf.icv_len = CCMP_MIC_LEN;
+                if (seq && seq_len == CCMP_PN_LEN) {
+                        for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
+                                for (j = 0; j < CCMP_PN_LEN; j++)
+                                        key->u.ccmp.rx_pn[i][j] =
+                                                seq[CCMP_PN_LEN - j - 1];
+                }
                 break;
         case ALG_AES_CMAC:
                 key->conf.iv_len = 0;
                 key->conf.icv_len = sizeof(struct ieee80211_mmie);
+                if (seq && seq_len == 6)
+                        for (j = 0; j < 6; j++)
+                                key->u.aes_cmac.rx_pn[j] = seq[6 - j - 1];
                 break;
         }
         memcpy(key->conf.key, key_data, key_len);
diff --git a/net/mac80211/key.h b/net/mac80211/key.h
index 215d3ef42a4f..9572e00f532c 100644
--- a/net/mac80211/key.h
+++ b/net/mac80211/key.h
@@ -144,7 +144,8 @@ struct ieee80211_key {
 struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg,
                                           int idx,
                                           size_t key_len,
-                                          const u8 *key_data);
+                                          const u8 *key_data,
+                                          size_t seq_len, const u8 *seq);
 /*
  * Insert a key into data structures (sdata, sta if necessary)
  * to make it used, free old key.
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index cad281390cfa..f0fec2f49828 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1115,6 +1115,11 @@ static int nl80211_new_key(struct sk_buff *skb, struct genl_info *info)
                 params.key_len = nla_len(info->attrs[NL80211_ATTR_KEY_DATA]);
         }
 
+        if (info->attrs[NL80211_ATTR_KEY_SEQ]) {
+                params.seq = nla_data(info->attrs[NL80211_ATTR_KEY_SEQ]);
+                params.seq_len = nla_len(info->attrs[NL80211_ATTR_KEY_SEQ]);
+        }
+
         if (info->attrs[NL80211_ATTR_KEY_IDX])
                 key_idx = nla_get_u8(info->attrs[NL80211_ATTR_KEY_IDX]);
 
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index ffc98a8d6e5c..f98090b90fbf 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -663,6 +663,11 @@ int cfg80211_wext_siwencodeext(struct net_device *dev,
         params.key_len = ext->key_len;
         params.cipher = cipher;
 
+        if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
+                params.seq = ext->rx_seq;
+                params.seq_len = 6;
+        }
+
         return cfg80211_set_encryption(
                         rdev, dev, addr, remove,
                         ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY,