From 749e8bfb337cd9808410909ddfdd86be39245501 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 20 Aug 2012 07:26:45 +0000 Subject: [PATCH] --- yaml --- r: 322051 b: refs/heads/master c: a9915a1b52df52ad87f3b33422da95cf25372f09 h: refs/heads/master i: 322049: 82021f01691c0e8f75b327538fd6f88ecfe42f54 322047: 27b0e523df4658ba9565de27ac71978c0533e2b2 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fee68d4b59cc..d48dd5cb7ba9 100644 --- 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 index 147ccc3e93db..c196d749daf2 100644 --- 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;