aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/raw.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/raw.c')
-rw-r--r--net/ipv4/raw.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 467d570d087a..b42b7cd56c03 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -418,7 +418,7 @@ static int raw_probe_proto_opt(struct flowi *fl, struct msghdr *msg)
418 if (!iov) 418 if (!iov)
419 continue; 419 continue;
420 420
421 switch (fl->proto) { 421 switch (fl->flowi_proto) {
422 case IPPROTO_ICMP: 422 case IPPROTO_ICMP:
423 /* check if one-byte field is readable or not. */ 423 /* check if one-byte field is readable or not. */
424 if (iov->iov_base && iov->iov_len < 1) 424 if (iov->iov_base && iov->iov_len < 1)
@@ -548,14 +548,14 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
548 } 548 }
549 549
550 { 550 {
551 struct flowi fl = { .oif = ipc.oif, 551 struct flowi fl = { .flowi_oif = ipc.oif,
552 .mark = sk->sk_mark, 552 .flowi_mark = sk->sk_mark,
553 .fl4_dst = daddr, 553 .fl4_dst = daddr,
554 .fl4_src = saddr, 554 .fl4_src = saddr,
555 .fl4_tos = tos, 555 .fl4_tos = tos,
556 .proto = inet->hdrincl ? IPPROTO_RAW : 556 .flowi_proto = inet->hdrincl ? IPPROTO_RAW :
557 sk->sk_protocol, 557 sk->sk_protocol,
558 .flags = FLOWI_FLAG_CAN_SLEEP, 558 .flowi_flags = FLOWI_FLAG_CAN_SLEEP,
559 }; 559 };
560 if (!inet->hdrincl) { 560 if (!inet->hdrincl) {
561 err = raw_probe_proto_opt(&fl, msg); 561 err = raw_probe_proto_opt(&fl, msg);