Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 535fb8d0 authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

vxlan: Call udp_flow_src_port 



In vxlan and OVS vport-vxlan call common function to get source port
for a UDP tunnel. Removed vxlan_src_port since the functionality is
now in udp_flow_src_port.

Signed-off-by: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8f1a556

drivers/net/vxlan.c

+2 −24
Original line number Diff line number Diff line
@@ -1570,25 +1570,6 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb) 
	return false;

}



/* Compute source port for outgoing packet

 *   first choice to use L4 flow hash since it will spread

 *     better and maybe available from hardware

 *   secondary choice is to use jhash on the Ethernet header

 */

__be16 vxlan_src_port(__u16 port_min, __u16 port_max, struct sk_buff *skb)

{

	unsigned int range = (port_max - port_min) + 1;

	u32 hash;



	hash = skb_get_hash(skb);

	if (!hash)

		hash = jhash(skb->data, 2 * ETH_ALEN,

			     (__force u32) skb->protocol);



	return htons((((u64) hash * range) >> 32) + port_min);

}

EXPORT_SYMBOL_GPL(vxlan_src_port);



static inline struct sk_buff *vxlan_handle_offloads(struct sk_buff *skb,

						    bool udp_csum)

{
@@ -1807,7 +1788,8 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
	if (tos == 1)

		tos = ip_tunnel_get_dsfield(old_iph, skb);



	src_port = vxlan_src_port(vxlan->port_min, vxlan->port_max, skb);

	src_port = udp_flow_src_port(dev_net(dev), skb, vxlan->port_min,

				     vxlan->port_max, true);



	if (dst->sa.sa_family == AF_INET) {

		memset(&fl4, 0, sizeof(fl4));
@@ -2235,7 +2217,6 @@ static void vxlan_setup(struct net_device *dev) 
{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	unsigned int h;

	int low, high;



	eth_hw_addr_random(dev);

	ether_setup(dev);
@@ -2272,9 +2253,6 @@ static void vxlan_setup(struct net_device *dev) 
	vxlan->age_timer.function = vxlan_cleanup;

	vxlan->age_timer.data = (unsigned long) vxlan;



	inet_get_local_port_range(dev_net(dev), &low, &high);

	vxlan->port_min = low;

	vxlan->port_max = high;

	vxlan->dst_port = htons(vxlan_port);



	vxlan->dev = dev;

include/net/vxlan.h

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 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);



__be16 vxlan_src_port(__u16 port_min, __u16 port_max, struct sk_buff *skb);



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

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

/* IPv6 header + UDP + VXLAN + Ethernet header */

net/openvswitch/vport-vxlan.c

+1 −4
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb) 
	struct rtable *rt;

	struct flowi4 fl;

	__be16 src_port;

	int port_min;

	int port_max;

	__be16 df;

	int err;
@@ -172,8 +170,7 @@ static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb) 


	skb->ignore_df = 1;



	inet_get_local_port_range(net, &port_min, &port_max);

	src_port = vxlan_src_port(port_min, port_max, skb);

	src_port = udp_flow_src_port(net, skb, 0, 0, true);



	err = vxlan_xmit_skb(vxlan_port->vs, rt, skb,

			     fl.saddr, OVS_CB(skb)->tun_key->ipv4_dst,