aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/main.c
diff options
context:
space:
mode:
authorBruno Randolf <br1@einfach.org>2010-09-08 03:05:04 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-09-16 15:22:10 -0400
commit040e539e8e8d5585e1c3d7d15fa7215d3a691258 (patch)
treecf9e3b12ec237395e6743aae0a3eafa88c9f7fc1 /drivers/net/wireless/ath/ath9k/main.c
parent781f3136ff4cdd2b33149f2295fefa21f77b1c56 (diff)
ath9k: Use common ath key management functions
Use key management functions which have been moved to ath/key.c and remove ath9k copies of these functions and other now unused definitions. Signed-off-by: Bruno Randolf <br1@einfach.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index a2f7eb2a552..fa875d1c7e9 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1769,7 +1769,7 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
1769 1769
1770 switch (cmd) { 1770 switch (cmd) {
1771 case SET_KEY: 1771 case SET_KEY:
1772 ret = ath9k_cmn_key_config(common, vif, sta, key); 1772 ret = ath_key_config(common, vif, sta, key);
1773 if (ret >= 0) { 1773 if (ret >= 0) {
1774 key->hw_key_idx = ret; 1774 key->hw_key_idx = ret;
1775 /* push IV and Michael MIC generation to stack */ 1775 /* push IV and Michael MIC generation to stack */
@@ -1783,7 +1783,7 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
1783 } 1783 }
1784 break; 1784 break;
1785 case DISABLE_KEY: 1785 case DISABLE_KEY:
1786 ath9k_cmn_key_delete(common, key); 1786 ath_key_delete(common, key);
1787 break; 1787 break;
1788 default: 1788 default:
1789 ret = -EINVAL; 1789 ret = -EINVAL;