---

yaml --- r: 22874 b: refs/heads/master c: 1a55d57 h: refs/heads/master v: v3
git-mirror · Mar 22, 2006 · 374a1ea · 374a1ea
1 parent 2a3bdb6
commit 374a1ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a534ee35cfd02f60e99d301b9ac446ea11a9cfd
+refs/heads/master: 1a55d57b107c3e06935763905dc0fb235214569d
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
@@ -1249,11 +1249,7 @@ int ip_push_pending_frames(struct sock *sk)
 	iph->tos = inet->tos;
 	iph->tot_len = htons(skb->len);
 	iph->frag_off = df;
-	if (!df) {
-		__ip_select_ident(iph, &rt->u.dst, 0);
-	} else {
-		iph->id = htons(inet->id++);
-	}
+	ip_select_ident(iph, &rt->u.dst, sk);
 	iph->ttl = ttl;
 	iph->protocol = sk->sk_protocol;
 	iph->saddr = rt->rt_src;