From bac4b761d9030b6672583b06c411bf23bcd10e5e Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 1 Dec 2011 13:28:34 -0500 Subject: [PATCH] --- yaml --- r: 278319 b: refs/heads/master c: 898f73585bbe4bdbb471636ecdede071f7473e51 h: refs/heads/master i: 278317: b922c639d48c4d7f5f7fc9171749a01fcb59c5e3 278315: cb64d0f1ff90f862d97231b72621e19aba1b6b2f 278311: c046171ae8d7a2534e93295f91f71e0318ff9767 278303: 396b7be6d5c0a6aa676695ae576a36d56a5e5b3b v: v3 --- [refs] | 2 +- trunk/net/dccp/ipv4.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index acf6940b3cf0..f2078136a2d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa17a019c87e2ed25b653844f668f111ee059e56 +refs/heads/master: 898f73585bbe4bdbb471636ecdede071f7473e51 diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c index 3f4e5414c8e5..1c67fe8ff90d 100644 --- a/trunk/net/dccp/ipv4.c +++ b/trunk/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,