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 'topic/ice1724-pm' into for-linus
[pandora-kernel.git]
/
include
/
linux
/
if_tunnel.h
diff --git
a/include/linux/if_tunnel.h
b/include/linux/if_tunnel.h
index
5a9aae4
..
5eb9b0f
100644
(file)
--- a/
include/linux/if_tunnel.h
+++ b/
include/linux/if_tunnel.h
@@
-44,7
+44,7
@@
struct ip_tunnel_prl {
__u16 flags;
__u16 __reserved;
__u32 datalen;
- __u32
__reserved2
;
+ __u32
rs_delay
;
/* data follows */
};