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 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
net
/
ipv4
/
esp4.c
diff --git
a/net/ipv4/esp4.c
b/net/ipv4/esp4.c
index
eae84cc
..
ba57446
100644
(file)
--- a/
net/ipv4/esp4.c
+++ b/
net/ipv4/esp4.c
@@
-362,7
+362,7
@@
static void esp_destroy(struct xfrm_state *x)
kfree(esp);
}
-static int esp_init_state(struct xfrm_state *x
, void *args
)
+static int esp_init_state(struct xfrm_state *x)
{
struct esp_data *esp = NULL;