git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[sfrench/cifs-2.6.git]
/
net
/
ipv4
/
ip_tunnel.c
diff --git
a/net/ipv4/ip_tunnel.c
b/net/ipv4/ip_tunnel.c
index 6f9de61dce5f9585625443af1d372ddb931adf03..afed1aac2638398c472de6504f7f4a43e5b2d502 100644
(file)
--- a/
net/ipv4/ip_tunnel.c
+++ b/
net/ipv4/ip_tunnel.c
@@
-69,23
+69,25
@@
static unsigned int ip_tunnel_hash(__be32 key, __be32 remote)
}
static void __tunnel_dst_set(struct ip_tunnel_dst *idst,
}
static void __tunnel_dst_set(struct ip_tunnel_dst *idst,
- struct dst_entry *dst)
+ struct dst_entry *dst
, __be32 saddr
)
{
struct dst_entry *old_dst;
dst_clone(dst);
old_dst = xchg((__force struct dst_entry **)&idst->dst, dst);
dst_release(old_dst);
{
struct dst_entry *old_dst;
dst_clone(dst);
old_dst = xchg((__force struct dst_entry **)&idst->dst, dst);
dst_release(old_dst);
+ idst->saddr = saddr;
}
}
-static void tunnel_dst_set(struct ip_tunnel *t, struct dst_entry *dst)
+static void tunnel_dst_set(struct ip_tunnel *t,
+ struct dst_entry *dst, __be32 saddr)
{
{
- __tunnel_dst_set(this_cpu_ptr(t->dst_cache), dst);
+ __tunnel_dst_set(this_cpu_ptr(t->dst_cache), dst
, saddr
);
}
static void tunnel_dst_reset(struct ip_tunnel *t)
{
}
static void tunnel_dst_reset(struct ip_tunnel *t)
{
- tunnel_dst_set(t, NULL);
+ tunnel_dst_set(t, NULL
, 0
);
}
void ip_tunnel_dst_reset_all(struct ip_tunnel *t)
}
void ip_tunnel_dst_reset_all(struct ip_tunnel *t)
@@
-93,20
+95,25
@@
void ip_tunnel_dst_reset_all(struct ip_tunnel *t)
int i;
for_each_possible_cpu(i)
int i;
for_each_possible_cpu(i)
- __tunnel_dst_set(per_cpu_ptr(t->dst_cache, i), NULL);
+ __tunnel_dst_set(per_cpu_ptr(t->dst_cache, i), NULL
, 0
);
}
EXPORT_SYMBOL(ip_tunnel_dst_reset_all);
}
EXPORT_SYMBOL(ip_tunnel_dst_reset_all);
-static struct rtable *tunnel_rtable_get(struct ip_tunnel *t, u32 cookie)
+static struct rtable *tunnel_rtable_get(struct ip_tunnel *t,
+ u32 cookie, __be32 *saddr)
{
{
+ struct ip_tunnel_dst *idst;
struct dst_entry *dst;
rcu_read_lock();
struct dst_entry *dst;
rcu_read_lock();
- dst = rcu_dereference(this_cpu_ptr(t->dst_cache)->dst);
+ idst = this_cpu_ptr(t->dst_cache);
+ dst = rcu_dereference(idst->dst);
if (dst && !atomic_inc_not_zero(&dst->__refcnt))
dst = NULL;
if (dst) {
if (dst && !atomic_inc_not_zero(&dst->__refcnt))
dst = NULL;
if (dst) {
- if (dst->obsolete && dst->ops->check(dst, cookie) == NULL) {
+ if (!dst->obsolete || dst->ops->check(dst, cookie)) {
+ *saddr = idst->saddr;
+ } else {
tunnel_dst_reset(t);
dst_release(dst);
dst = NULL;
tunnel_dst_reset(t);
dst_release(dst);
dst = NULL;
@@
-305,7
+312,7
@@
static struct net_device *__ip_tunnel_create(struct net *net,
}
ASSERT_RTNL();
}
ASSERT_RTNL();
- dev = alloc_netdev(ops->priv_size, name, ops->setup);
+ dev = alloc_netdev(ops->priv_size, name,
NET_NAME_UNKNOWN,
ops->setup);
if (!dev) {
err = -ENOMEM;
goto failed;
if (!dev) {
err = -ENOMEM;
goto failed;
@@
-367,7
+374,7
@@
static int ip_tunnel_bind_dev(struct net_device *dev)
if (!IS_ERR(rt)) {
tdev = rt->dst.dev;
if (!IS_ERR(rt)) {
tdev = rt->dst.dev;
- tunnel_dst_set(tunnel, &rt->dst);
+ tunnel_dst_set(tunnel, &rt->dst
, fl4.saddr
);
ip_rt_put(rt);
}
if (dev->type != ARPHRD_ETHER)
ip_rt_put(rt);
}
if (dev->type != ARPHRD_ETHER)
@@
-610,7
+617,7
@@
void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
init_tunnel_flow(&fl4, protocol, dst, tnl_params->saddr,
tunnel->parms.o_key, RT_TOS(tos), tunnel->parms.link);
init_tunnel_flow(&fl4, protocol, dst, tnl_params->saddr,
tunnel->parms.o_key, RT_TOS(tos), tunnel->parms.link);
- rt = connected ? tunnel_rtable_get(tunnel, 0) : NULL;
+ rt = connected ? tunnel_rtable_get(tunnel, 0
, &fl4.saddr
) : NULL;
if (!rt) {
rt = ip_route_output_key(tunnel->net, &fl4);
if (!rt) {
rt = ip_route_output_key(tunnel->net, &fl4);
@@
-620,7
+627,7
@@
void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
goto tx_error;
}
if (connected)
goto tx_error;
}
if (connected)
- tunnel_dst_set(tunnel, &rt->dst);
+ tunnel_dst_set(tunnel, &rt->dst
, fl4.saddr
);
}
if (rt->dst.dev == dev) {
}
if (rt->dst.dev == dev) {