]> git.proxmox.com Git - ovs.git/commitdiff
compat: Fix compile warning
authorGreg Rose <gvrose8192@gmail.com>
Mon, 4 Jun 2018 20:33:30 +0000 (13:33 -0700)
committerBen Pfaff <blp@ovn.org>
Mon, 4 Jun 2018 22:59:23 +0000 (15:59 -0700)
Fix compile warning about redefined symbol

Fixes: 10f242363d ("compat: Add skb_checksum_simple_complete()")
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
datapath/linux/compat/include/linux/skbuff.h

index c50cac24a74bb2d99a7f9c4a176b0a1bf68b07ed..4a6ac2384c6064b5090bc0e9fa4b63b7cb071e13 100644 (file)
@@ -57,13 +57,14 @@ do {                                                                        \
 
 #ifndef SKB_CHECKSUM_SIMPLE_VALIDATE
 
+#ifndef __skb_checksum_validate
 #define __skb_checksum_validate(skb, proto, complete,                  \
                                zero_okay, check, compute_pseudo)       \
 ({                                                                     \
        __sum16 __ret = 0;                                              \
        __ret;                                                          \
 })
-
+#endif
 
 #define skb_checksum_simple_validate(skb)                              \
        __skb_checksum_validate(skb, 0, true, false, 0, null_compute_pseudo)