Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / net / ieee80211 / ieee80211_wx.c

diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index a78c4f845f66a88f3a2f95fb59adc8790c6af723..40d7a55fe03e8158d49b85e8dd18da705cf3250f 100644 (file)
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -369,11 +369,10 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
                struct ieee80211_crypt_data *new_crypt;
 
                /* take WEP into use */
-               new_crypt = kmalloc(sizeof(struct ieee80211_crypt_data),
+               new_crypt = kzalloc(sizeof(struct ieee80211_crypt_data),
                                    GFP_KERNEL);
                if (new_crypt == NULL)
                        return -ENOMEM;
-               memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
                new_crypt->ops = ieee80211_get_crypto_ops("WEP");
                if (!new_crypt->ops) {
                        request_module("ieee80211_crypt_wep");
@@ -616,13 +615,11 @@ int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
 
                ieee80211_crypt_delayed_deinit(ieee, crypt);
 
-               new_crypt = (struct ieee80211_crypt_data *)
-                   kmalloc(sizeof(*new_crypt), GFP_KERNEL);
+               new_crypt = kzalloc(sizeof(*new_crypt), GFP_KERNEL);
                if (new_crypt == NULL) {
                        ret = -ENOMEM;
                        goto done;
                }
-               memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
                new_crypt->ops = ops;
                if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
                        new_crypt->priv = new_crypt->ops->init(idx);
@@ -757,7 +754,7 @@ int ieee80211_wx_set_auth(struct net_device *dev,
        int err = 0;
 
        spin_lock_irqsave(&ieee->lock, flags);
-       
+
        switch (wrqu->param.flags & IW_AUTH_INDEX) {
        case IW_AUTH_WPA_VERSION:
        case IW_AUTH_CIPHER_PAIRWISE:
@@ -802,7 +799,7 @@ int ieee80211_wx_get_auth(struct net_device *dev,
        int err = 0;
 
        spin_lock_irqsave(&ieee->lock, flags);
-       
+
        switch (wrqu->param.flags & IW_AUTH_INDEX) {
        case IW_AUTH_WPA_VERSION:
        case IW_AUTH_CIPHER_PAIRWISE: