projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
net
/
ipv6
/
inet6_connection_sock.c
diff --git
a/net/ipv6/inet6_connection_sock.c
b/net/ipv6/inet6_connection_sock.c
index
25b9317
..
78de42a
100644
(file)
--- a/
net/ipv6/inet6_connection_sock.c
+++ b/
net/ipv6/inet6_connection_sock.c
@@
-146,7
+146,7
@@
void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
__ip6_dst_store(sk, dst, daddr, saddr);
#ifdef CONFIG_XFRM
-
if (dst)
{
+ {
struct rt6_info *rt = (struct rt6_info *)dst;
rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
}