Merge tag 'platform-drivers-x86-v4.6-1' of git://git.infradead.org/users/dvhart/linux...

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

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 95d2f198017ef1a6db687ddfe405a13830a37f3f..836abe58a9c52c1e0a613d0c1517b0819556c6c8 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -356,8 +356,8 @@ EXPORT_SYMBOL(udp_lib_get_port);
  * match_wildcard == false: addresses must be exactly the same, i.e.
  *                          0.0.0.0 only equals to 0.0.0.0
  */
-static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2,
-                               bool match_wildcard)
+int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2,
+                        bool match_wildcard)
 {
        struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);
 
@@ -848,32 +848,20 @@ void udp_set_csum(bool nocheck, struct sk_buff *skb,
 {
        struct udphdr *uh = udp_hdr(skb);
 
-       if (nocheck)
+       if (nocheck) {
                uh->check = 0;
-       else if (skb_is_gso(skb))
+       } else if (skb_is_gso(skb)) {
                uh->check = ~udp_v4_check(len, saddr, daddr, 0);
-       else if (skb_dst(skb) && skb_dst(skb)->dev &&
-                (skb_dst(skb)->dev->features &
-                 (NETIF_F_IP_CSUM | NETIF_F_HW_CSUM))) {
-
-               BUG_ON(skb->ip_summed == CHECKSUM_PARTIAL);
-
+       } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
+               uh->check = 0;
+               uh->check = udp_v4_check(len, saddr, daddr, lco_csum(skb));
+               if (uh->check == 0)
+                       uh->check = CSUM_MANGLED_0;
+       } else {
                skb->ip_summed = CHECKSUM_PARTIAL;
                skb->csum_start = skb_transport_header(skb) - skb->head;
                skb->csum_offset = offsetof(struct udphdr, check);
                uh->check = ~udp_v4_check(len, saddr, daddr, 0);
-       } else {
-               __wsum csum;
-
-               BUG_ON(skb->ip_summed == CHECKSUM_PARTIAL);
-
-               uh->check = 0;
-               csum = skb_checksum(skb, 0, len, 0);
-               uh->check = udp_v4_check(len, saddr, daddr, csum);
-               if (uh->check == 0)
-                       uh->check = CSUM_MANGLED_0;
-
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
        }
 }
 EXPORT_SYMBOL(udp_set_csum);