Commit 31088cb5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'report-erspan-version-field-just-for-erspan-tunnels' 



Lorenzo Bianconi says:

====================
report erspan version field just for erspan tunnels

Do not report erspan_version to userpsace for non erspan tunnels.
Report IFLA_GRE_ERSPAN_INDEX only for erspan version 1 in
ip6gre_fill_info
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9e8db591 103d0244

net/ipv4/ip_gre.c

+17 −16
Original line number Original line Diff line number Diff line
@@ -1457,10 +1457,24 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev) 
	struct ip_tunnel_parm *p = &t->parms;

	struct ip_tunnel_parm *p = &t->parms;

	__be16 o_flags = p->o_flags;

	__be16 o_flags = p->o_flags;





	if ((t->erspan_ver == 1 || t->erspan_ver == 2) &&

	if (t->erspan_ver == 1 || t->erspan_ver == 2) {

	    !t->collect_md)

		if (!t->collect_md)

			o_flags |= TUNNEL_KEY;

			o_flags |= TUNNEL_KEY;





		if (nla_put_u8(skb, IFLA_GRE_ERSPAN_VER, t->erspan_ver))

			goto nla_put_failure;



		if (t->erspan_ver == 1) {

			if (nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, t->index))

				goto nla_put_failure;

		} else {

			if (nla_put_u8(skb, IFLA_GRE_ERSPAN_DIR, t->dir))

				goto nla_put_failure;

			if (nla_put_u16(skb, IFLA_GRE_ERSPAN_HWID, t->hwid))

				goto nla_put_failure;

		}

	}



	if (nla_put_u32(skb, IFLA_GRE_LINK, p->link) ||

	if (nla_put_u32(skb, IFLA_GRE_LINK, p->link) ||

	    nla_put_be16(skb, IFLA_GRE_IFLAGS,

	    nla_put_be16(skb, IFLA_GRE_IFLAGS,

			 gre_tnl_flags_to_gre_flags(p->i_flags)) ||

			 gre_tnl_flags_to_gre_flags(p->i_flags)) ||
@@ -1495,19 +1509,6 @@ static int ipgre_fill_info(struct sk_buff *skb, const struct net_device *dev) 
			goto nla_put_failure;

			goto nla_put_failure;

	}

	}





	if (nla_put_u8(skb, IFLA_GRE_ERSPAN_VER, t->erspan_ver))

		goto nla_put_failure;



	if (t->erspan_ver == 1) {

		if (nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, t->index))

			goto nla_put_failure;

	} else if (t->erspan_ver == 2) {

		if (nla_put_u8(skb, IFLA_GRE_ERSPAN_DIR, t->dir))

			goto nla_put_failure;

		if (nla_put_u16(skb, IFLA_GRE_ERSPAN_HWID, t->hwid))

			goto nla_put_failure;

	}



	return 0;

	return 0;





nla_put_failure:

nla_put_failure:

net/ipv6/ip6_gre.c

+18 −18
Original line number Original line Diff line number Diff line
@@ -2104,10 +2104,24 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev) 
	struct __ip6_tnl_parm *p = &t->parms;

	struct __ip6_tnl_parm *p = &t->parms;

	__be16 o_flags = p->o_flags;

	__be16 o_flags = p->o_flags;





	if ((p->erspan_ver == 1 || p->erspan_ver == 2) &&

	if (p->erspan_ver == 1 || p->erspan_ver == 2) {

	    !p->collect_md)

		if (!p->collect_md)

			o_flags |= TUNNEL_KEY;

			o_flags |= TUNNEL_KEY;





		if (nla_put_u8(skb, IFLA_GRE_ERSPAN_VER, p->erspan_ver))

			goto nla_put_failure;



		if (p->erspan_ver == 1) {

			if (nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, p->index))

				goto nla_put_failure;

		} else {

			if (nla_put_u8(skb, IFLA_GRE_ERSPAN_DIR, p->dir))

				goto nla_put_failure;

			if (nla_put_u16(skb, IFLA_GRE_ERSPAN_HWID, p->hwid))

				goto nla_put_failure;

		}

	}



	if (nla_put_u32(skb, IFLA_GRE_LINK, p->link) ||

	if (nla_put_u32(skb, IFLA_GRE_LINK, p->link) ||

	    nla_put_be16(skb, IFLA_GRE_IFLAGS,

	    nla_put_be16(skb, IFLA_GRE_IFLAGS,

			 gre_tnl_flags_to_gre_flags(p->i_flags)) ||

			 gre_tnl_flags_to_gre_flags(p->i_flags)) ||
@@ -2121,8 +2135,7 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev) 
	    nla_put_u8(skb, IFLA_GRE_ENCAP_LIMIT, p->encap_limit) ||

	    nla_put_u8(skb, IFLA_GRE_ENCAP_LIMIT, p->encap_limit) ||

	    nla_put_be32(skb, IFLA_GRE_FLOWINFO, p->flowinfo) ||

	    nla_put_be32(skb, IFLA_GRE_FLOWINFO, p->flowinfo) ||

	    nla_put_u32(skb, IFLA_GRE_FLAGS, p->flags) ||

	    nla_put_u32(skb, IFLA_GRE_FLAGS, p->flags) ||

	    nla_put_u32(skb, IFLA_GRE_FWMARK, p->fwmark) ||

	    nla_put_u32(skb, IFLA_GRE_FWMARK, p->fwmark))

	    nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, p->index))

		goto nla_put_failure;

		goto nla_put_failure;





	if (nla_put_u16(skb, IFLA_GRE_ENCAP_TYPE,

	if (nla_put_u16(skb, IFLA_GRE_ENCAP_TYPE,
@@ -2140,19 +2153,6 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev) 
			goto nla_put_failure;

			goto nla_put_failure;

	}

	}





	if (nla_put_u8(skb, IFLA_GRE_ERSPAN_VER, p->erspan_ver))

		goto nla_put_failure;



	if (p->erspan_ver == 1) {

		if (nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, p->index))

			goto nla_put_failure;

	} else if (p->erspan_ver == 2) {

		if (nla_put_u8(skb, IFLA_GRE_ERSPAN_DIR, p->dir))

			goto nla_put_failure;

		if (nla_put_u16(skb, IFLA_GRE_ERSPAN_HWID, p->hwid))

			goto nla_put_failure;

	}



	return 0;

	return 0;





nla_put_failure:

nla_put_failure:

CRA Git | Maintained and supported by SUSTech CRA and CCSE