diff options
author | Panagiotis Issaris <takis@issaris.org> | 2005-11-07 18:03:15 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2005-11-07 21:50:01 -0500 |
commit | b69a3aa85cb7bda2eb6c5932a62c1337d0d6612c (patch) | |
tree | 64a65fcec724795c213ab96c1419c95a78c41be4 /drivers/net/wireless/ipw2100.c | |
parent | f36be62115aabd50b4eda0f06f07ab5fae2e9cfd (diff) |
[PATCH] wireless net: Conversions of kmalloc/memset to kzalloc
More conversions of kmalloc/memset to kzalloc
Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2100.c')
-rw-r--r-- | drivers/net/wireless/ipw2100.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index ad7f8cd76db9..4f19ac7d63a8 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
@@ -6065,13 +6065,11 @@ static int ipw2100_wpa_set_encryption(struct net_device *dev, | |||
6065 | 6065 | ||
6066 | ieee80211_crypt_delayed_deinit(ieee, crypt); | 6066 | ieee80211_crypt_delayed_deinit(ieee, crypt); |
6067 | 6067 | ||
6068 | new_crypt = (struct ieee80211_crypt_data *) | 6068 | new_crypt = kzalloc(sizeof(struct ieee80211_crypt_data), GFP_KERNEL); |
6069 | kmalloc(sizeof(struct ieee80211_crypt_data), GFP_KERNEL); | ||
6070 | if (new_crypt == NULL) { | 6069 | if (new_crypt == NULL) { |
6071 | ret = -ENOMEM; | 6070 | ret = -ENOMEM; |
6072 | goto done; | 6071 | goto done; |
6073 | } | 6072 | } |
6074 | memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data)); | ||
6075 | new_crypt->ops = ops; | 6073 | new_crypt->ops = ops; |
6076 | if (new_crypt->ops && try_module_get(new_crypt->ops->owner)) | 6074 | if (new_crypt->ops && try_module_get(new_crypt->ops->owner)) |
6077 | new_crypt->priv = new_crypt->ops->init(param->u.crypt.idx); | 6075 | new_crypt->priv = new_crypt->ops->init(param->u.crypt.idx); |