git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sii-m15w' into upstream
[pandora-kernel.git]
/
net
/
ipv4
/
esp4.c
diff --git
a/net/ipv4/esp4.c
b/net/ipv4/esp4.c
index
9bbdd44
..
fc2f8ce
100644
(file)
--- a/
net/ipv4/esp4.c
+++ b/
net/ipv4/esp4.c
@@
-1,4
+1,3
@@
-#include <linux/config.h>
#include <linux/module.h>
#include <net/ip.h>
#include <net/xfrm.h>
#include <linux/module.h>
#include <net/ip.h>
#include <net/xfrm.h>
@@
-317,12
+316,10
@@
static int esp_init_state(struct xfrm_state *x)
if (x->ealg == NULL)
goto error;
if (x->ealg == NULL)
goto error;
- esp = k
m
alloc(sizeof(*esp), GFP_KERNEL);
+ esp = k
z
alloc(sizeof(*esp), GFP_KERNEL);
if (esp == NULL)
return -ENOMEM;
if (esp == NULL)
return -ENOMEM;
- memset(esp, 0, sizeof(*esp));
-
if (x->aalg) {
struct xfrm_algo_desc *aalg_desc;
if (x->aalg) {
struct xfrm_algo_desc *aalg_desc;