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 'for-3.17/core' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
include
/
net
/
ip_tunnels.h
diff --git
a/include/net/ip_tunnels.h
b/include/net/ip_tunnels.h
index
a4daf9e
..
8dd8cab
100644
(file)
--- a/
include/net/ip_tunnels.h
+++ b/
include/net/ip_tunnels.h
@@
-40,6
+40,7
@@
struct ip_tunnel_prl_entry {
struct ip_tunnel_dst {
struct dst_entry __rcu *dst;
+ __be32 saddr;
};
struct ip_tunnel {