Commit 1da80d91 authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

geneve: pass the geneve device ptr to geneve_build_skb() 



Instead of handing to it the geneve configuration in multiple arguments.
This already avoids some code duplication and we are going to pass soon
more arguments to such function.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Link: https://patch.msgid.link/761f05690646181fffc533ee4db59b68e5c3a0c3.1769011015.git.pabeni@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 759b8d3c

drivers/net/geneve.c

+8 −12
Original line number Diff line number Diff line
@@ -775,10 +775,11 @@ static void geneve_build_header(struct genevehdr *geneveh, 


static int geneve_build_skb(struct dst_entry *dst, struct sk_buff *skb,

			    const struct ip_tunnel_info *info,

			    bool xnet, int ip_hdr_len,

			    bool inner_proto_inherit)

			    const struct geneve_dev *geneve, int ip_hdr_len)

{

	bool udp_sum = test_bit(IP_TUNNEL_CSUM_BIT, info->key.tun_flags);

	bool inner_proto_inherit = geneve->cfg.inner_proto_inherit;

	bool xnet = !net_eq(geneve->net, dev_net(geneve->dev));

	struct genevehdr *gnvh;

	__be16 inner_proto;

	bool double_encap;
@@ -830,8 +831,6 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
			   struct geneve_dev *geneve,

			   const struct ip_tunnel_info *info)

{

	bool inner_proto_inherit = geneve->cfg.inner_proto_inherit;

	bool xnet = !net_eq(geneve->net, dev_net(geneve->dev));

	struct geneve_sock *gs4 = rcu_dereference(geneve->sock4);

	const struct ip_tunnel_key *key = &info->key;

	struct rtable *rt;
@@ -842,7 +841,7 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
	__be16 sport;

	int err;



	if (skb_vlan_inet_prepare(skb, inner_proto_inherit))

	if (skb_vlan_inet_prepare(skb, geneve->cfg.inner_proto_inherit))

		return -EINVAL;



	if (!gs4)
@@ -925,8 +924,8 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
		}

	}



	err = geneve_build_skb(&rt->dst, skb, info, xnet, sizeof(struct iphdr),

			       inner_proto_inherit);

	err = geneve_build_skb(&rt->dst, skb, info, geneve,

			       sizeof(struct iphdr));

	if (unlikely(err))

		return err;
@@ -943,8 +942,6 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
			    struct geneve_dev *geneve,

			    const struct ip_tunnel_info *info)

{

	bool inner_proto_inherit = geneve->cfg.inner_proto_inherit;

	bool xnet = !net_eq(geneve->net, dev_net(geneve->dev));

	struct geneve_sock *gs6 = rcu_dereference(geneve->sock6);

	const struct ip_tunnel_key *key = &info->key;

	struct dst_entry *dst = NULL;
@@ -954,7 +951,7 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
	__be16 sport;

	int err;



	if (skb_vlan_inet_prepare(skb, inner_proto_inherit))

	if (skb_vlan_inet_prepare(skb, geneve->cfg.inner_proto_inherit))

		return -EINVAL;



	if (!gs6)
@@ -1017,8 +1014,7 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
			ttl = key->ttl;

		ttl = ttl ? : ip6_dst_hoplimit(dst);

	}

	err = geneve_build_skb(dst, skb, info, xnet, sizeof(struct ipv6hdr),

			       inner_proto_inherit);

	err = geneve_build_skb(dst, skb, info, geneve, sizeof(struct ipv6hdr));

	if (unlikely(err))

		return err;