Commit 11bf7828 authored by Joe Stringer's avatar Joe Stringer Committed by David S. Miller
Browse files

vxlan: Inline vxlan_gso_check(). 



Suggested-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarJoe Stringer <joestringer@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent feb91a02

drivers/net/vxlan.c

+0 −19
Original line number Diff line number Diff line
@@ -67,12 +67,6 @@ 


#define VXLAN_FLAGS 0x08000000	/* struct vxlanhdr.vx_flags required value. */



/* VXLAN protocol header */

struct vxlanhdr {

	__be32 vx_flags;

	__be32 vx_vni;

};



/* UDP port for VXLAN traffic.

 * The IANA assigned port is 4789, but the Linux default is 8472

 * for compatibility with early adopters.
@@ -1571,19 +1565,6 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb) 
	return false;

}



bool vxlan_gso_check(struct sk_buff *skb)

{

	if ((skb_shinfo(skb)->gso_type & SKB_GSO_UDP_TUNNEL) &&

	    (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))))

		return false;



	return true;

}

EXPORT_SYMBOL_GPL(vxlan_gso_check);



#if IS_ENABLED(CONFIG_IPV6)

static int vxlan6_xmit_skb(struct vxlan_sock *vs,

			   struct dst_entry *dst, struct sk_buff *skb,

include/net/vxlan.h

+17 −1
Original line number Diff line number Diff line
@@ -8,6 +8,12 @@ 
#define VNI_HASH_BITS	10

#define VNI_HASH_SIZE	(1<<VNI_HASH_BITS)



/* VXLAN protocol header */

struct vxlanhdr {

	__be32 vx_flags;

	__be32 vx_vni;

};



struct vxlan_sock;

typedef void (vxlan_rcv_t)(struct vxlan_sock *vh, struct sk_buff *skb, __be32 key);
@@ -45,7 +51,17 @@ int vxlan_xmit_skb(struct vxlan_sock *vs, 
		   __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df,

		   __be16 src_port, __be16 dst_port, __be32 vni, bool xnet);



bool vxlan_gso_check(struct sk_buff *skb);

static inline bool vxlan_gso_check(struct sk_buff *skb)

{

	if ((skb_shinfo(skb)->gso_type & SKB_GSO_UDP_TUNNEL) &&

	    (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))))

		return false;



	return true;

}



/* IP header + UDP + VXLAN + Ethernet header */

#define VXLAN_HEADROOM (20 + 8 + 8 + 14)