---

yaml --- r: 322051 b: refs/heads/master c: a9915a1 h: refs/heads/master i: 322049: 82021f0 322047: 27b0e52 v: v3
git-mirror · Aug 21, 2012 · 749e8bf · 749e8bf
1 parent 8a0f511
commit 749e8bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a7b27c97ce675b42eeb7bfaf6e15c34f35c8f95
+refs/heads/master: a9915a1b52df52ad87f3b33422da95cf25372f09
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
@@ -1338,10 +1338,10 @@ struct sk_buff *__ip_make_skb(struct sock *sk,
 	iph->ihl = 5;
 	iph->tos = inet->tos;
 	iph->frag_off = df;
-	ip_select_ident(iph, &rt->dst, sk);
 	iph->ttl = ttl;
 	iph->protocol = sk->sk_protocol;
 	ip_copy_addrs(iph, fl4);
+	ip_select_ident(iph, &rt->dst, sk);
 
 	if (opt) {
 		iph->ihl += opt->optlen>>2;