1 files changed, 4 insertions, 2 deletions

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 193db03540ad..41e1d2845c8f 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -299,7 +299,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
 {
         /* Charge it to the socket. */
 
-        ipv4_pktinfo_prepare(skb);
+        ipv4_pktinfo_prepare(sk, skb);
         if (sock_queue_rcv_skb(sk, skb) < 0) {
                 kfree_skb(skb);
                 return NET_RX_DROP;
@@ -519,6 +519,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
         ipc.addr = inet->inet_saddr;
         ipc.opt = NULL;
         ipc.tx_flags = 0;
+        ipc.ttl = 0;
+        ipc.tos = -1;
         ipc.oif = sk->sk_bound_dev_if;
 
         if (msg->msg_controllen) {
@@ -558,7 +560,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                         daddr = ipc.opt->opt.faddr;
                 }
         }
-        tos = RT_CONN_FLAGS(sk);
+        tos = get_rtconn_flags(&ipc, sk);
         if (msg->msg_flags & MSG_DONTROUTE)
                 tos |= RTO_ONLINK;