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 'linus' into x86/gart
[pandora-kernel.git]
/
include
/
linux
/
if_tunnel.h
diff --git
a/include/linux/if_tunnel.h
b/include/linux/if_tunnel.h
index
f1fbe9c
..
d4efe40
100644
(file)
--- a/
include/linux/if_tunnel.h
+++ b/
include/linux/if_tunnel.h
@@
-41,7
+41,7
@@
struct ip_tunnel_prl {
__u16 __reserved;
__u32 datalen;
__u32 __reserved2;
__u16 __reserved;
__u32 datalen;
__u32 __reserved2;
- void __user *data;
+ /* data follows */
};
/* PRL flags */
};
/* PRL flags */