From 374a1ea4f467553e793d91fa00d90aec084d24be Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Date: Wed, 22 Mar 2006 14:27:59 -0800
Subject: [PATCH] --- yaml --- r: 22874 b: refs/heads/master c:
 1a55d57b107c3e06935763905dc0fb235214569d h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/ip_output.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3fa2d885a6f1..c075f73443b2 100644
--- 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
index 8ee4d016740d..f75ff1d96551 100644
--- 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;