aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee80211/ieee80211_crypt.c
diff options
context:
space:
mode:
authorJames Ketrenos <jketreno@linux.intel.com>2005-09-22 06:34:15 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-22 15:40:59 -0400
commit6eb6edf04acd09e3cea09456913e8da59323b89e (patch)
tree7cf648aba7823b1b7cc9419f682a2dca60cc2e82 /net/ieee80211/ieee80211_crypt.c
parente5658d3e8a347f4393a9403b0cec8d43fa6214b1 (diff)
[PATCH] ieee80211: in-tree driver updates to sync with latest ieee80211 series
Changed crypto method from requiring a struct ieee80211_device reference to the init handler. Instead we now have a get/set flags method for each crypto component. Setting of TKIP countermeasures can now be done via set_flags(IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) Signed-off-by: James Ketrenos <jketreno@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'net/ieee80211/ieee80211_crypt.c')
-rw-r--r--net/ieee80211/ieee80211_crypt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c
index e26bcc918032..f3b6aa3be638 100644
--- a/net/ieee80211/ieee80211_crypt.c
+++ b/net/ieee80211/ieee80211_crypt.c
@@ -202,8 +202,7 @@ struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name)
202 return NULL; 202 return NULL;
203} 203}
204 204
205static void *ieee80211_crypt_null_init(struct ieee80211_device *ieee, 205static void *ieee80211_crypt_null_init(int keyidx)
206 int keyidx)
207{ 206{
208 return (void *)1; 207 return (void *)1;
209} 208}