diff options
| author | Jiri Benc <jbenc@redhat.com> | 2016-02-16 20:59:00 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-18 04:52:12 (GMT) |
| commit | 3288af0892e322b019a4c98810959b2a1c6dae7b (patch) | |
| tree | 4b23b7b8f09579fc05ab7cd1ab0fa3d68b2cf3c0 | |
| parent | be5cfeab8f95995d5590ab919b9f4dde19d50ea7 (diff) | |
| download | linux-3288af0892e322b019a4c98810959b2a1c6dae7b.tar.xz | |
vxlan: move GBP header parsing to a separate function
To make vxlan_udp_encap_recv shorter and more comprehensible.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/vxlan.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 161e39c..f65a923 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1156,6 +1156,24 @@ static bool vxlan_remcsum(struct sk_buff *skb, u32 vxflags, __be32 vni_field) return true; } +static void vxlan_parse_gbp_hdr(struct sk_buff *skb, struct vxlan_metadata *md, + struct metadata_dst *tun_dst) +{ + struct vxlanhdr_gbp *gbp; + + gbp = (struct vxlanhdr_gbp *)vxlan_hdr(skb); + md->gbp = ntohs(gbp->policy_id); + + if (tun_dst) + tun_dst->u.tun_info.key.tun_flags |= TUNNEL_VXLAN_OPT; + + if (gbp->dont_learn) + md->gbp |= VXLAN_GBP_DONT_LEARN; + + if (gbp->policy_applied) + md->gbp |= VXLAN_GBP_POLICY_APPLIED; +} + static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb, struct vxlan_metadata *md, __be32 vni, struct metadata_dst *tun_dst) @@ -1304,20 +1322,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb) * used by VXLAN extensions if explicitly requested. */ if ((flags & VXLAN_HF_GBP) && (vs->flags & VXLAN_F_GBP)) { - struct vxlanhdr_gbp *gbp; - - gbp = (struct vxlanhdr_gbp *)vxlan_hdr(skb); - md->gbp = ntohs(gbp->policy_id); - - if (tun_dst) - tun_dst->u.tun_info.key.tun_flags |= TUNNEL_VXLAN_OPT; - - if (gbp->dont_learn) - md->gbp |= VXLAN_GBP_DONT_LEARN; - - if (gbp->policy_applied) - md->gbp |= VXLAN_GBP_POLICY_APPLIED; - + vxlan_parse_gbp_hdr(skb, md, tun_dst); flags &= ~VXLAN_GBP_USED_BITS; } |