projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
include
/
linux
/
if_tunnel.h
diff --git
a/include/linux/if_tunnel.h
b/include/linux/if_tunnel.h
index
5eb9b0f
..
5a9aae4
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;
__u16 flags;
__u16 __reserved;
__u32 datalen;
- __u32
rs_delay
;
+ __u32
__reserved2
;
/* data follows */
};
/* data follows */
};