git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
ieee80211
/
ieee80211_crypt_ccmp.c
diff --git
a/net/ieee80211/ieee80211_crypt_ccmp.c
b/net/ieee80211/ieee80211_crypt_ccmp.c
index
78b2d13
..
ed90a8a
100644
(file)
--- a/
net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/
net/ieee80211/ieee80211_crypt_ccmp.c
@@
-9,7
+9,6
@@
* more details.
*/
* more details.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
@@
-77,10
+76,9
@@
static void *ieee80211_ccmp_init(int key_idx)
{
struct ieee80211_ccmp_data *priv;
{
struct ieee80211_ccmp_data *priv;
- priv = k
m
alloc(sizeof(*priv), GFP_ATOMIC);
+ priv = k
z
alloc(sizeof(*priv), GFP_ATOMIC);
if (priv == NULL)
goto fail;
if (priv == NULL)
goto fail;
- memset(priv, 0, sizeof(*priv));
priv->key_idx = key_idx;
priv->tfm = crypto_alloc_tfm("aes", 0);
priv->key_idx = key_idx;
priv->tfm = crypto_alloc_tfm("aes", 0);