diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-19 13:13:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-19 13:13:47 -0800 |
| commit | 24912420e923d56461b400d83f250a31bed8a964 (patch) | |
| tree | 3bb599e665ed7510df2e3f4c8cb008f7a33f50a9 /net/ipv4 | |
| parent | 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 (diff) | |
| parent | 0302b8622ce696af1cda22fcf207d3793350e896 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/icmp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 4daebd17b6e..4aa1b7f01ea 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -559,6 +559,9 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) /* No need to clone since we're just using its address. */ rt2 = rt; + if (!fl.nl_u.ip4_u.saddr) + fl.nl_u.ip4_u.saddr = rt->rt_src; + err = xfrm_lookup(net, (struct dst_entry **)&rt, &fl, NULL, 0); switch (err) { case 0: |