summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-13 17:21:27 -0400
committerDavid S. Miller <davem@davemloft.net>2011-05-13 17:21:27 -0400
commit22f728f8f311659b068e73ed92833c205651a47f (patch)
treecab06ba8b08c8c88a021d597c031c1ef24fae732 /net
parent0374d9ceb02eb12fcd65be9dd5df9c911ef93424 (diff)
downloadop-kernel-dev-22f728f8f311659b068e73ed92833c205651a47f.zip
op-kernel-dev-22f728f8f311659b068e73ed92833c205651a47f.tar.gz
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')
-rw-r--r--net/ipv4/ip_output.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 70778d4..98af369 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;
/*
OpenPOWER on IntegriCloud