diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-13 23:21:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-13 23:21:27 +0200 |
| commit | 22f728f8f311659b068e73ed92833c205651a47f (patch) | |
| tree | cab06ba8b08c8c88a021d597c031c1ef24fae732 /net/ipv4/ip_output.c | |
| parent | ipv4: Kill spurious write to iph->daddr in ip_forward_options(). (diff) | |
| download | linux-22f728f8f311659b068e73ed92833c205651a47f.tar.xz linux-22f728f8f311659b068e73ed92833c205651a47f.zip | |
ipv4: Always call ip_options_build() after rest of IP header is filled in.
This will allow ip_options_build() to reliably look at the values of
iph->{daddr,saddr}
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_output.c')
| -rw-r--r-- | net/ipv4/ip_output.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 70778d48aa7b..98af3697c718 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1327,10 +1327,6 @@ struct sk_buff *__ip_make_skb(struct sock *sk, iph = (struct iphdr *)skb->data; iph->version = 4; iph->ihl = 5; - if (opt) { - iph->ihl += opt->optlen>>2; - ip_options_build(skb, opt, cork->addr, rt, 0); - } iph->tos = inet->tos; iph->frag_off = df; ip_select_ident(iph, &rt->dst, sk); @@ -1339,6 +1335,11 @@ struct sk_buff *__ip_make_skb(struct sock *sk, iph->saddr = fl4->saddr; iph->daddr = fl4->daddr; + if (opt) { + iph->ihl += opt->optlen>>2; + ip_options_build(skb, opt, cork->addr, rt, 0); + } + skb->priority = sk->sk_priority; skb->mark = sk->sk_mark; /* |