diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-31 04:53:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-31 04:53:51 -0700 |
| commit | ef164ae3563bf4d291b6f75ca2e120b17d606963 (patch) | |
| tree | 4b4048121bd4980ed89b89639ac652df85741180 /net | |
| parent | 538de0e01f1ca3568ad03877ff297c646dd8ad23 (diff) | |
| download | op-kernel-dev-ef164ae3563bf4d291b6f75ca2e120b17d606963.zip op-kernel-dev-ef164ae3563bf4d291b6f75ca2e120b17d606963.tar.gz | |
ipv4: Use flowi4_init_output() in raw_sendmsg()
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/raw.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 2d3c72e..7d32d9d 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) |
