net: IPv6 changes

krkumar · davem330 · commit f04c8276248d · 2009-10-20T18:55:45.000-07:00
IPv6: Reset sk_tx_queue_mapping when dst_cache is reset. Use existing
macro to do the work.

Signed-off-by: Krishna Kumar &lt;krkumar2@in.ibm.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
@@ -168,8 +168,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
 	if (dst) {
 		struct rt6_info *rt = (struct rt6_info *)dst;
 		if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
-			sk->sk_dst_cache = NULL;
-			dst_release(dst);
+			__sk_dst_reset(sk);
 			dst = NULL;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,7 @@ struct dst_entry __inet6_csk_dst_check(struct sock sk, u32 cookie)`
`168`	`168`	`if (dst) {`
`169`	`169`	`struct rt6_info rt = (struct rt6_info )dst;`
`170`	`170`	`if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {`
`171`		`- sk->sk_dst_cache = NULL;`
`172`		`- dst_release(dst);`
	`171`	`+ __sk_dst_reset(sk);`
`173`	`172`	`dst = NULL;`
`174`	`173`	`}`
`175`	`174`	`}`