diff mbox

[net-next] ipv4: use a 64bit load/store in output path

Message ID 1322724521.2577.29.camel@edumazet-laptop
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Eric Dumazet Dec. 1, 2011, 7:28 a.m. UTC 
Le jeudi 01 décembre 2011 à 01:48 -0500, David Miller a écrit :
> From: Eric Dumazet <eric.dumazet@gmail.com>
> Date: Thu, 01 Dec 2011 06:00:53 +0100
> 
> > gcc compiler is smart enough to use a single load/store if we
> > memcpy(dptr, sptr, 8) on x86_64, regardless of
> > CONFIG_CC_OPTIMIZE_FOR_SIZE
> >     
> > In IP header, daddr immediately follows saddr, this wont change in the
> > future. We only need to make sure our flowi4 (saddr,daddr) fields wont
> > break the rule.
> > 
> > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> 
> Hmmm, this triggers a strange new build warning:
> 
> net/dccp/ipv4.c: In function ‘dccp_v4_route_skb’:
> net/dccp/ipv4.c:481:3: warning: initialized field with side-effects overwritten [enabled by default]
> net/dccp/ipv4.c:481:3: warning: (near initialization for ‘fl4’) [enabled by default]

Hmm, seems a compiler bug, since following fixes the warning ?

[PATCH net-next] dccp: fix a compiler warning

net/dccp/ipv4.c: In function ‘dccp_v4_route_skb’:
net/dccp/ipv4.c:481:3: warning: initialized field with
	side-effects overwritten [enabled by default]
net/dccp/ipv4.c:481:3: warning: (near initialization
	for ‘fl4’) [enabled by default]


Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
 net/dccp/ipv4.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 3f4e541..1c67fe8 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,