net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM

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

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 24ec14f9825c20834eca20b820ec953ba108da52..8841e984f8bff631891e20f3cb6d0e686829daf6 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -100,7 +100,6 @@
 #include <linux/slab.h>
 #include <net/tcp_states.h>
 #include <linux/skbuff.h>
-#include <linux/netdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <net/net_namespace.h>
@@ -773,7 +772,8 @@ void udp_set_csum(bool nocheck, struct sk_buff *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_V4_CSUM)) {
+                (skb_dst(skb)->dev->features &
+                 (NETIF_F_IP_CSUM | NETIF_F_HW_CSUM))) {
 
                BUG_ON(skb->ip_summed == CHECKSUM_PARTIAL);