diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-09-26 11:53:17 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:54:18 -0400 |
commit | 628a140ba033ef201706a8c7e767c8a0c0f8326c (patch) | |
tree | 7aae1dbc152bf9180fee3d238f224c2f4b1741b5 /drivers | |
parent | 640845a5632390eaa9357cd818646c8f0ee3d47e (diff) |
[MAC80211]: remove ALG_NONE
This "algorithm" is used only internally and is not useful.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Cc: Michael Buesch <mb@bu3sch.de>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 4 |
3 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 6c80f2e2f4ee..c141a264ac45 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -2827,9 +2827,6 @@ static int b43_dev_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
2827 | if (!dev) | 2827 | if (!dev) |
2828 | return -ENODEV; | 2828 | return -ENODEV; |
2829 | switch (key->alg) { | 2829 | switch (key->alg) { |
2830 | case ALG_NONE: | ||
2831 | algorithm = B43_SEC_ALGO_NONE; | ||
2832 | break; | ||
2833 | case ALG_WEP: | 2830 | case ALG_WEP: |
2834 | if (key->keylen == 5) | 2831 | if (key->keylen == 5) |
2835 | algorithm = B43_SEC_ALGO_WEP40; | 2832 | algorithm = B43_SEC_ALGO_WEP40; |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 2cd7caa69e46..75e3b5c3f155 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -2579,10 +2579,6 @@ static void iwl_build_tx_cmd_hwcrypto(struct iwl_priv *priv, | |||
2579 | "with key %d\n", ctl->key_idx); | 2579 | "with key %d\n", ctl->key_idx); |
2580 | break; | 2580 | break; |
2581 | 2581 | ||
2582 | case ALG_NONE: | ||
2583 | IWL_DEBUG_TX("Tx packet in the clear (encrypt requested).\n"); | ||
2584 | break; | ||
2585 | |||
2586 | default: | 2582 | default: |
2587 | printk(KERN_ERR "Unknown encode alg %d\n", keyinfo->alg); | 2583 | printk(KERN_ERR "Unknown encode alg %d\n", keyinfo->alg); |
2588 | break; | 2584 | break; |
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 5a8342664af1..b1a6e39f7821 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -2663,10 +2663,6 @@ static void iwl_build_tx_cmd_hwcrypto(struct iwl_priv *priv, | |||
2663 | "with key %d\n", ctl->key_idx); | 2663 | "with key %d\n", ctl->key_idx); |
2664 | break; | 2664 | break; |
2665 | 2665 | ||
2666 | case ALG_NONE: | ||
2667 | IWL_DEBUG_TX("Tx packet in the clear (encrypt requested).\n"); | ||
2668 | break; | ||
2669 | |||
2670 | default: | 2666 | default: |
2671 | printk(KERN_ERR "Unknown encode alg %d\n", keyinfo->alg); | 2667 | printk(KERN_ERR "Unknown encode alg %d\n", keyinfo->alg); |
2672 | break; | 2668 | break; |