From: David S. Miller <davem@davemloft.net>
Date: Thu, 31 Mar 2011 11:53:51 +0000 (-0700)
Subject: ipv4: Use flowi4_init_output() in raw_sendmsg()
X-Git-Tag: v3.0-rc1~377^2~554
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ef164ae3563bf4d291b6f75ca2e120b17d606963;p=karo-tx-linux.git

ipv4: Use flowi4_init_output() in raw_sendmsg()

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 2d3c72e5bbbf..7d32d9d57152 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -548,17 +548,13 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 	}
 
 	{
-		struct flowi4 fl4 = {
-			.flowi4_oif = ipc.oif,
-			.flowi4_mark = sk->sk_mark,
-			.daddr = daddr,
-			.saddr = saddr,
-			.flowi4_tos = tos,
-			.flowi4_proto = (inet->hdrincl ?
-					 IPPROTO_RAW :
-					 sk->sk_protocol),
-			.flowi4_flags = FLOWI_FLAG_CAN_SLEEP,
-		};
+		struct flowi4 fl4;
+
+		flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
+				   RT_SCOPE_UNIVERSE,
+				   inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol,
+				   FLOWI_FLAG_CAN_SLEEP, daddr, saddr, 0, 0);
+
 		if (!inet->hdrincl) {
 			err = raw_probe_proto_opt(&fl4, msg);
 			if (err)