diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-12-01 13:28:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-01 13:28:34 -0500 |
| commit | 898f73585bbe4bdbb471636ecdede071f7473e51 (patch) | |
| tree | 73a587dbc21e397737984808bfa9c8594f06210d | |
| parent | powerpc: tqm8548/tqm8xx: add and update CAN device nodes (diff) | |
| download | linux-dev-898f73585bbe4bdbb471636ecdede071f7473e51.tar.xz linux-dev-898f73585bbe4bdbb471636ecdede071f7473e51.zip | |
dccp: Evaluate ip_hdr() only once in dccp_v4_route_skb().
This also works around a bogus gcc warning generated by an
upcoming patch from Eric Dumazet that rearranges the layout
of struct flowi4.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/dccp/ipv4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 3f4e5414c8e5..1c67fe8ff90d 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -474,10 +474,11 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk, struct sk_buff *skb) { struct rtable *rt; + const struct iphdr *iph = ip_hdr(skb); struct flowi4 fl4 = { .flowi4_oif = skb_rtable(skb)->rt_iif, - .daddr = ip_hdr(skb)->saddr, - .saddr = ip_hdr(skb)->daddr, + .daddr = iph->saddr, + .saddr = iph->daddr, .flowi4_tos = RT_CONN_FLAGS(sk), .flowi4_proto = sk->sk_protocol, .fl4_sport = dccp_hdr(skb)->dccph_dport, |