diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-29 14:47:07 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-29 14:47:07 -0400 |
| commit | ae3568adf42d5d3bb3cfa505b94351c5d1ce4924 (patch) | |
| tree | 112865a6e6b1e4ddf70362f3efb295c495ec85b9 /net/mac80211/key.h | |
| parent | 7f3e01fee41a322747db2d7574516d9fbd3785c0 (diff) | |
| parent | b7753c8cd51dce67a0b152efb456a21ff1cc241b (diff) | |
| download | op-kernel-dev-ae3568adf42d5d3bb3cfa505b94351c5d1ce4924.zip op-kernel-dev-ae3568adf42d5d3bb3cfa505b94351c5d1ce4924.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/mac80211/key.h')
| -rw-r--r-- | net/mac80211/key.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/key.h b/net/mac80211/key.h index a3849fa..b665bbb 100644 --- a/net/mac80211/key.h +++ b/net/mac80211/key.h @@ -135,7 +135,8 @@ struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg, void ieee80211_key_link(struct ieee80211_key *key, struct ieee80211_sub_if_data *sdata, struct sta_info *sta); -void ieee80211_key_free(struct ieee80211_key *key); +void ieee80211_key_free(struct ieee80211_local *local, + struct ieee80211_key *key); void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx); void ieee80211_set_default_mgmt_key(struct ieee80211_sub_if_data *sdata, int idx); |
