diff --git a/[refs] b/[refs] index 76fefc1835f0..a6873d5a3ed4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94df109a8c802263837baccc1a3eeab9ab9e88db +refs/heads/master: 5418c6926fcb0e5a324cd5bc1106fc0941db7aae diff --git a/trunk/net/ipv4/raw.c b/trunk/net/ipv4/raw.c index 8c1512021ee8..8d17dd3542df 100644 --- a/trunk/net/ipv4/raw.c +++ b/trunk/net/ipv4/raw.c @@ -514,7 +514,10 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, kfree(ipc.opt); ip_rt_put(rt); -out: return err < 0 ? err : len; +out: + if (err < 0) + return err; + return len; do_confirm: dst_confirm(&rt->u.dst); @@ -610,7 +613,10 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, copied = skb->len; done: skb_free_datagram(sk, skb); -out: return err ? err : copied; +out: + if (err) + return err; + return copied; } static int raw_init(struct sock *sk)