diff options
| author |   Jiri Benc <jbenc@redhat.com> | 2016-02-16 21:58:59 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-02-17 23:52:11 -0500 |
| commit | be5cfeab8f95995d5590ab919b9f4dde19d50ea7 (patch) | |
| tree | 112b930d7615fcc57475226cd1b13f788b26d80d /drivers/net/vxlan.c | |
| parent | vxlan: keep flags and vni in network byte order (diff) | |
| download | linux-dev-be5cfeab8f95995d5590ab919b9f4dde19d50ea7.tar.xz linux-dev-be5cfeab8f95995d5590ab919b9f4dde19d50ea7.zip | |
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>
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 4e3d3dfe2a0e..161e39ce3914 100644 --- 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; |