vxlan: simplify vxlan_remcsum

Part of the parameters is not needed. Simplify the caller of this function
in preparation of making vxlan rx more comprehensible.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 4e3d3dfe2a0e1c41c45aa3735c8e7240ca7fb86d..161e39ce3914f0e090fc8f54645a7187768f573d 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1135,29 +1135,25 @@ static int vxlan_igmp_leave(struct vxlan_dev *vxlan)
        return ret;
 }
 
-static struct vxlanhdr *vxlan_remcsum(struct sk_buff *skb, struct vxlanhdr *vh,
-                                     size_t hdrlen, __be32 vni_field,
-                                     bool nopartial)
+static bool vxlan_remcsum(struct sk_buff *skb, u32 vxflags, __be32 vni_field)
 {
        size_t start, offset, plen;
 
        if (skb->remcsum_offload)
-               return vh;
+               return true;
 
        start = vxlan_rco_start(vni_field);
        offset = start + vxlan_rco_offset(vni_field);
 
-       plen = hdrlen + offset + sizeof(u16);
+       plen = sizeof(struct vxlanhdr) + offset + sizeof(u16);
 
        if (!pskb_may_pull(skb, plen))
-               return NULL;
-
-       vh = (struct vxlanhdr *)(udp_hdr(skb) + 1);
+               return false;
 
-       skb_remcsum_process(skb, (void *)vh + hdrlen, start, offset,
-                           nopartial);
+       skb_remcsum_process(skb, (void *)(vxlan_hdr(skb) + 1), start, offset,
+                           !!(vxflags & VXLAN_F_REMCSUM_NOPARTIAL));
 
-       return vh;
+       return true;
 }
 
 static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb,
@@ -1285,9 +1281,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
                goto drop;
 
        if ((flags & VXLAN_HF_RCO) && (vs->flags & VXLAN_F_REMCSUM_RX)) {
-               if (!vxlan_remcsum(skb, vxlan_hdr(skb), sizeof(struct vxlanhdr),
-                                  vni_field,
-                                  !!(vs->flags & VXLAN_F_REMCSUM_NOPARTIAL)))
+               if (!vxlan_remcsum(skb, vs->flags, vni_field))
                        goto drop;
 
                flags &= ~VXLAN_HF_RCO;