net: Add and use skb_copy_datagram_msg() helper.

[deliverable/linux.git] / net / ipv4 / udp.c

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index cd0db5471bb5eb6048208404aab71253867e1eec..df19027f44f3d6fbe13dec78d3b085968dbf2329 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1281,8 +1281,8 @@ try_again:
        }
 
        if (skb_csum_unnecessary(skb))
-               err = skb_copy_datagram_iovec(skb, sizeof(struct udphdr),
-                                             msg->msg_iov, copied);
+               err = skb_copy_datagram_msg(skb, sizeof(struct udphdr),
+                                           msg, copied);
        else {
                err = skb_copy_and_csum_datagram_iovec(skb,
                                                       sizeof(struct udphdr),
@@ -1777,14 +1777,13 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
                if (ret > 0)
                        return -ret;
                return 0;
-       } else {
-               if (rt->rt_flags & (RTCF_BROADCAST|RTCF_MULTICAST))
-                       return __udp4_lib_mcast_deliver(net, skb, uh,
-                                       saddr, daddr, udptable);
-
-               sk = __udp4_lib_lookup_skb(skb, uh->source, uh->dest, udptable);
        }
 
+       if (rt->rt_flags & (RTCF_BROADCAST|RTCF_MULTICAST))
+               return __udp4_lib_mcast_deliver(net, skb, uh,
+                               saddr, daddr, udptable);
+
+       sk = __udp4_lib_lookup_skb(skb, uh->source, uh->dest, udptable);
        if (sk != NULL) {
                int ret;