diff options
| author | Bruno Randolf <br1@einfach.org> | 2010-09-08 16:05:04 +0900 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-16 15:22:10 -0400 |
| commit | 040e539e8e8d5585e1c3d7d15fa7215d3a691258 (patch) | |
| tree | cf9e3b12ec237395e6743aae0a3eafa88c9f7fc1 /drivers/net/wireless/ath/ath9k/htc_drv_main.c | |
| parent | 781f3136ff4cdd2b33149f2295fefa21f77b1c56 (diff) | |
| download | linux-stable-040e539e8e8d5585e1c3d7d15fa7215d3a691258.tar.gz linux-stable-040e539e8e8d5585e1c3d7d15fa7215d3a691258.tar.bz2 linux-stable-040e539e8e8d5585e1c3d7d15fa7215d3a691258.zip | |
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/htc_drv_main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index bab894873bf5..5124d04b240b 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -1590,7 +1590,7 @@ static int ath9k_htc_set_key(struct ieee80211_hw *hw, switch (cmd) { case SET_KEY: - ret = ath9k_cmn_key_config(common, vif, sta, key); + ret = ath_key_config(common, vif, sta, key); if (ret >= 0) { key->hw_key_idx = ret; /* push IV and Michael MIC generation to stack */ @@ -1604,7 +1604,7 @@ static int ath9k_htc_set_key(struct ieee80211_hw *hw, } break; case DISABLE_KEY: - ath9k_cmn_key_delete(common, key); + ath_key_delete(common, key); break; default: ret = -EINVAL; |