diff options
author | James Ketrenos <jketreno@linux.intel.com> | 2005-09-22 06:34:15 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 15:40:59 -0400 |
commit | 6eb6edf04acd09e3cea09456913e8da59323b89e (patch) | |
tree | 7cf648aba7823b1b7cc9419f682a2dca60cc2e82 /net/ieee80211/ieee80211_wx.c | |
parent | e5658d3e8a347f4393a9403b0cec8d43fa6214b1 (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_wx.c')
-rw-r--r-- | net/ieee80211/ieee80211_wx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c index 3dd2bbae0c2..ee7a70a1325 100644 --- a/net/ieee80211/ieee80211_wx.c +++ b/net/ieee80211/ieee80211_wx.c | |||
@@ -355,7 +355,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, | |||
355 | } | 355 | } |
356 | 356 | ||
357 | if (new_crypt->ops && try_module_get(new_crypt->ops->owner)) | 357 | if (new_crypt->ops && try_module_get(new_crypt->ops->owner)) |
358 | new_crypt->priv = new_crypt->ops->init(ieee, key); | 358 | new_crypt->priv = new_crypt->ops->init(key); |
359 | 359 | ||
360 | if (!new_crypt->ops || !new_crypt->priv) { | 360 | if (!new_crypt->ops || !new_crypt->priv) { |
361 | kfree(new_crypt); | 361 | kfree(new_crypt); |
@@ -598,7 +598,7 @@ int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee, | |||
598 | memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data)); | 598 | memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data)); |
599 | new_crypt->ops = ops; | 599 | new_crypt->ops = ops; |
600 | if (new_crypt->ops && try_module_get(new_crypt->ops->owner)) | 600 | if (new_crypt->ops && try_module_get(new_crypt->ops->owner)) |
601 | new_crypt->priv = new_crypt->ops->init(ieee, idx); | 601 | new_crypt->priv = new_crypt->ops->init(idx); |
602 | if (new_crypt->priv == NULL) { | 602 | if (new_crypt->priv == NULL) { |
603 | kfree(new_crypt); | 603 | kfree(new_crypt); |
604 | ret = -EINVAL; | 604 | ret = -EINVAL; |