From 7039595da201a9112db4b6577f6dbdfdafb27dcb Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Mon, 20 Aug 2007 11:01:11 +0800 Subject: [PATCH 13/31] iwlwifi: iwl_mac_set_key cleanup Signed-off-by: Zhu Yi --- drivers/net/wireless/iwl-base.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/iwl-base.c b/drivers/net/wireless/iwl-base.c index b80839d..f6b7cc0 100644 --- a/drivers/net/wireless/iwl-base.c +++ b/drivers/net/wireless/iwl-base.c @@ -7958,8 +7958,8 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, set_key_cmd cmd, u8 *addr, sta_id = iwl_hw_find_station(priv, addr); if (sta_id == IWL_INVALID_STATION) { - IWL_DEBUG_MAC80211("leave - " MAC_FMT - " not in station map.\n", MAC_ARG(addr)); + IWL_DEBUG_MAC80211("leave - " MAC_FMT " not in station map.\n", + MAC_ARG(addr)); return -EINVAL; } @@ -7973,14 +7973,8 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, set_key_cmd cmd, u8 *addr, if (!rc) { iwl_set_rxon_hwcrypto(priv, 1); iwl_commit_rxon(priv); - key->flags &= (u32) - (~IEEE80211_KEY_FORCE_SW_ENCRYPT); + key->flags &= ~IEEE80211_KEY_FORCE_SW_ENCRYPT; key->hw_key_idx = sta_id; - /* TODO do we need below */ - /* - * conf->sw_encrypt = 0; - * conf->sw_decrypt = 0; - */ IWL_DEBUG_MAC80211("set_key success, using hwcrypto\n"); } @@ -9166,7 +9160,6 @@ static struct ieee80211_ops iwl_hw_ops = { #endif /* CONFIG_IWLWIFI_HT */ #endif .hw_scan = iwl_mac_hw_scan - }; static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) -- 1.5.2