Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[deliverable/linux.git] / include / net / vxlan.h

diff --git a/include/net/vxlan.h b/include/net/vxlan.h
index a763c96ecde403bd4cc8ddd9f6136685c281be2c..35437c779da8d6d6d113ed0deedbd39428852238 100644 (file)
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
@@ -252,7 +252,9 @@ static inline netdev_features_t vxlan_features_check(struct sk_buff *skb,
            (skb->inner_protocol_type != ENCAP_TYPE_ETHER ||
             skb->inner_protocol != htons(ETH_P_TEB) ||
             (skb_inner_mac_header(skb) - skb_transport_header(skb) !=
-             sizeof(struct udphdr) + sizeof(struct vxlanhdr))))
+             sizeof(struct udphdr) + sizeof(struct vxlanhdr)) ||
+            (skb->ip_summed != CHECKSUM_NONE &&
+             !can_checksum_protocol(features, inner_eth_hdr(skb)->h_proto))))
                return features & ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK);
 
        return features;
@@ -271,36 +273,36 @@ static inline struct vxlanhdr *vxlan_hdr(struct sk_buff *skb)
 static inline __be32 vxlan_vni(__be32 vni_field)
 {
 #if defined(__BIG_ENDIAN)
-       return vni_field >> 8;
+       return (__force __be32)((__force u32)vni_field >> 8);
 #else
-       return (vni_field & VXLAN_VNI_MASK) << 8;
+       return (__force __be32)((__force u32)(vni_field & VXLAN_VNI_MASK) << 8);
 #endif
 }
 
 static inline __be32 vxlan_vni_field(__be32 vni)
 {
 #if defined(__BIG_ENDIAN)
-       return vni << 8;
+       return (__force __be32)((__force u32)vni << 8);
 #else
-       return vni >> 8;
+       return (__force __be32)((__force u32)vni >> 8);
 #endif
 }
 
 static inline __be32 vxlan_tun_id_to_vni(__be64 tun_id)
 {
 #if defined(__BIG_ENDIAN)
-       return tun_id;
+       return (__force __be32)tun_id;
 #else
-       return tun_id >> 32;
+       return (__force __be32)((__force u64)tun_id >> 32);
 #endif
 }
 
 static inline __be64 vxlan_vni_to_tun_id(__be32 vni)
 {
 #if defined(__BIG_ENDIAN)
-       return (__be64)vni;
+       return (__force __be64)vni;
 #else
-       return (__be64)vni << 32;
+       return (__force __be64)((u64)(__force u32)vni << 32);
 #endif
 }