Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 90304
b: refs/heads/master
c: deb09c4
h: refs/heads/master
v: v3
  • Loading branch information
Emmanuel Grumbach authored and John W. Linville committed Mar 25, 2008
1 parent 49c8bc5 commit ddb120d
Show file tree
Hide file tree
Showing 3 changed files with 111 additions and 57 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bf85ea4fbecab278c63f02fd102b33cc6cb21eb9
refs/heads/master: deb09c435e3f947f8b2c9d5df6a9c0a5b472b125
1 change: 1 addition & 0 deletions trunk/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,7 @@ struct iwl4965_qosparam_cmd {
/* wep key in STA: 5-bytes (0) or 13-bytes (1) */
#define STA_KEY_FLG_KEY_SIZE_MSK __constant_cpu_to_le16(0x1000)
#define STA_KEY_MULTICAST_MSK __constant_cpu_to_le16(0x4000)
#define STA_KEY_MAX_NUM 8

/* Flags indicate whether to modify vs. don't change various station params */
#define STA_MODIFY_KEY_MASK 0x01
Expand Down
165 changes: 109 additions & 56 deletions trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,17 @@ static int iwl4965_send_cmd_sync(struct iwl_priv *priv, struct iwl4965_host_cmd
return ret;
}

static void iwl4965_set_rxon_hwcrypto(struct iwl_priv *priv, int hw_decrypt)
{
struct iwl4965_rxon_cmd *rxon = &priv->staging_rxon;

if (hw_decrypt)
rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;
else
rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;

}

int iwl4965_send_cmd(struct iwl_priv *priv, struct iwl4965_host_cmd *cmd)
{
if (cmd->meta.flags & CMD_ASYNC)
Expand Down Expand Up @@ -1124,6 +1135,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv)
le16_to_cpu(priv->staging_rxon.channel),
print_mac(mac, priv->staging_rxon.bssid_addr));

iwl4965_set_rxon_hwcrypto(priv, priv->cfg->mod_params->hw_crypto);
/* Apply the new configuration */
rc = iwl4965_send_cmd_pdu(priv, REPLY_RXON,
sizeof(struct iwl4965_rxon_cmd), &priv->staging_rxon);
Expand Down Expand Up @@ -1336,42 +1348,52 @@ int iwl4965_send_add_station(struct iwl_priv *priv,
return rc;
}

static int iwl4965_update_sta_key_info(struct iwl_priv *priv,
static int iwl4965_set_ccmp_dynamic_key_info(struct iwl_priv *priv,
struct ieee80211_key_conf *keyconf,
u8 sta_id)
{
unsigned long flags;
__le16 key_flags = 0;

switch (keyconf->alg) {
case ALG_CCMP:
key_flags |= STA_KEY_FLG_CCMP;
key_flags |= cpu_to_le16(
keyconf->keyidx << STA_KEY_FLG_KEYID_POS);
key_flags &= ~STA_KEY_FLG_INVALID;
break;
case ALG_TKIP:
case ALG_WEP:
default:
return -EINVAL;
}
key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK);
key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);

if (sta_id == priv->hw_setting.bcast_sta_id)
key_flags |= STA_KEY_MULTICAST_MSK;

keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
keyconf->hw_key_idx = keyconf->keyidx;

key_flags &= ~STA_KEY_FLG_INVALID;

spin_lock_irqsave(&priv->sta_lock, flags);
priv->stations[sta_id].keyinfo.alg = keyconf->alg;
priv->stations[sta_id].keyinfo.keylen = keyconf->keylen;

memcpy(priv->stations[sta_id].keyinfo.key, keyconf->key,
keyconf->keylen);

memcpy(priv->stations[sta_id].sta.key.key, keyconf->key,
keyconf->keylen);

priv->stations[sta_id].sta.key.key_offset
= (sta_id % STA_KEY_MAX_NUM);/*FIXME*/
priv->stations[sta_id].sta.key.key_flags = key_flags;
priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;
priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;

spin_unlock_irqrestore(&priv->sta_lock, flags);

IWL_DEBUG_INFO("hwcrypto: modify ucode station key info\n");
iwl4965_send_add_station(priv, &priv->stations[sta_id].sta, 0);
return 0;
return iwl4965_send_add_station(priv,
&priv->stations[sta_id].sta, CMD_ASYNC);
}

static int iwl4965_set_tkip_dynamic_key_info(struct iwl_priv *priv,
struct ieee80211_key_conf *keyconf,
u8 sta_id)
{
return -EOPNOTSUPP;
}

static int iwl4965_clear_sta_key_info(struct iwl_priv *priv, u8 sta_id)
Expand All @@ -1391,6 +1413,46 @@ static int iwl4965_clear_sta_key_info(struct iwl_priv *priv, u8 sta_id)
return 0;
}

static int iwl4965_set_dynamic_key(struct iwl_priv *priv,
struct ieee80211_key_conf *key, u8 sta_id)
{
int ret;

switch (key->alg) {
case ALG_CCMP:
ret = iwl4965_set_ccmp_dynamic_key_info(priv, key, sta_id);
break;
case ALG_TKIP:
ret = iwl4965_set_tkip_dynamic_key_info(priv, key, sta_id);
break;
case ALG_WEP:
ret = -EOPNOTSUPP;
break;
default:
IWL_ERROR("Unknown alg: %s alg = %d\n", __func__, key->alg);
ret = -EINVAL;
}

return ret;
}

static int iwl4965_remove_static_key(struct iwl_priv *priv)
{
int ret = -EOPNOTSUPP;

return ret;
}

static int iwl4965_set_static_key(struct iwl_priv *priv,
struct ieee80211_key_conf *key)
{
if (key->alg == ALG_WEP)
return -EOPNOTSUPP;

IWL_ERROR("Static key invalid: alg %d\n", key->alg);
return -EINVAL;
}

static void iwl4965_clear_free_frames(struct iwl_priv *priv)
{
struct list_head *element;
Expand Down Expand Up @@ -2122,17 +2184,6 @@ static int iwl4965_scan_initiate(struct iwl_priv *priv)
return 0;
}

static int iwl4965_set_rxon_hwcrypto(struct iwl_priv *priv, int hw_decrypt)
{
struct iwl4965_rxon_cmd *rxon = &priv->staging_rxon;

if (hw_decrypt)
rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;
else
rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;

return 0;
}

static void iwl4965_set_flags_for_phymode(struct iwl_priv *priv,
enum ieee80211_band band)
Expand Down Expand Up @@ -2276,9 +2327,9 @@ static void iwl4965_build_tx_cmd_hwcrypto(struct iwl_priv *priv,
struct ieee80211_tx_control *ctl,
struct iwl4965_cmd *cmd,
struct sk_buff *skb_frag,
int last_frag)
int sta_id)
{
struct iwl4965_hw_key *keyinfo = &priv->stations[ctl->key_idx].keyinfo;
struct iwl4965_hw_key *keyinfo = &priv->stations[sta_id].keyinfo;

switch (keyinfo->alg) {
case ALG_CCMP:
Expand Down Expand Up @@ -2614,7 +2665,7 @@ static int iwl4965_tx_skb(struct iwl_priv *priv,
iwl4965_hw_txq_attach_buf_to_tfd(priv, tfd, txcmd_phys, len);

if (!(ctl->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT))
iwl4965_build_tx_cmd_hwcrypto(priv, ctl, out_cmd, skb, 0);
iwl4965_build_tx_cmd_hwcrypto(priv, ctl, out_cmd, skb, sta_id);

/* Set up TFD's 2nd entry to point directly to remainder of skb,
* if any (802.11 null frames have no payload). */
Expand Down Expand Up @@ -7121,8 +7172,9 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
{
struct iwl_priv *priv = hw->priv;
DECLARE_MAC_BUF(mac);
int rc = 0;
u8 sta_id;
int ret = 0;
u8 sta_id = IWL_INVALID_STATION;
u8 static_key;

IWL_DEBUG_MAC80211("enter\n");

Expand All @@ -7135,44 +7187,45 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
/* only support pairwise keys */
return -EOPNOTSUPP;

sta_id = iwl4965_hw_find_station(priv, addr);
if (sta_id == IWL_INVALID_STATION) {
IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
print_mac(mac, addr));
return -EINVAL;
}
/* FIXME: need to differenciate between static and dynamic key
* in the level of mac80211 */
static_key = !iwl4965_is_associated(priv);

mutex_lock(&priv->mutex);
if (!static_key) {
sta_id = iwl4965_hw_find_station(priv, addr);
if (sta_id == IWL_INVALID_STATION) {
IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
print_mac(mac, addr));
return -EINVAL;
}
}

iwl4965_scan_cancel_timeout(priv, 100);

switch (cmd) {
case SET_KEY:
rc = iwl4965_update_sta_key_info(priv, key, sta_id);
if (!rc) {
iwl4965_set_rxon_hwcrypto(priv, 1);
iwl4965_commit_rxon(priv);
key->hw_key_idx = sta_id;
IWL_DEBUG_MAC80211("set_key success, using hwcrypto\n");
key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
}
case SET_KEY:
if (static_key)
ret = iwl4965_set_static_key(priv, key);
else
ret = iwl4965_set_dynamic_key(priv, key, sta_id);

IWL_DEBUG_MAC80211("enable hwcrypto key\n");
break;
case DISABLE_KEY:
rc = iwl4965_clear_sta_key_info(priv, sta_id);
if (!rc) {
iwl4965_set_rxon_hwcrypto(priv, 0);
iwl4965_commit_rxon(priv);
IWL_DEBUG_MAC80211("disable hwcrypto key\n");
}
if (static_key)
ret = iwl4965_remove_static_key(priv);
else
ret = iwl4965_clear_sta_key_info(priv, sta_id);

IWL_DEBUG_MAC80211("disable hwcrypto key\n");
break;
default:
rc = -EINVAL;
ret = -EINVAL;
}

IWL_DEBUG_MAC80211("leave\n");
mutex_unlock(&priv->mutex);

return rc;
return ret;
}

static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, int queue,
Expand Down

0 comments on commit ddb120d

Please sign in to comment.