Merge branch ‘report-erspan-version-field-just-for-erspan-tunnels’ [Linux 5.0]

Merge branch ‘report-erspan-version-field-just-for-erspan-tunnels’ [Linux 5.0]

This Linux kernel change "Merge branch ‘report-erspan-version-field-just-for-erspan-tunnels’" is included in the Linux 5.0 release. This change is authored by David S. Miller <davem [at] davemloft.net> on Thu Feb 21 16:02:10 2019 -0800. The commit for this change in Linux stable tree is 31088cb (patch). Other info about this change: Merge: 9e8db59 103d024

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: David S. Miller <[email protected]>

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 net/ipv6/ip6_gre.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 4389089..0fdd010 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -2104,9 +2104,23 @@ static int ip6gre_fill_info(struct sk_buff *skb, const struct net_device *dev)
    struct __ip6_tnl_parm *p = &t->parms;
    __be16 o_flags = p->o_flags;

-   if ((p->erspan_ver == 1 || p->erspan_ver == 2) &&
-       !p->collect_md)
-       o_flags |= TUNNEL_KEY;
+   if (p->erspan_ver == 1 || p->erspan_ver == 2) {
+       if (!p->collect_md)
+           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) ||
        nla_put_be16(skb, IFLA_GRE_IFLAGS,
@@ -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_be32(skb, IFLA_GRE_FLOWINFO, p->flowinfo) ||
        nla_put_u32(skb, IFLA_GRE_FLAGS, p->flags) ||
-       nla_put_u32(skb, IFLA_GRE_FWMARK, p->fwmark) ||
-       nla_put_u32(skb, IFLA_GRE_ERSPAN_INDEX, p->index))
+       nla_put_u32(skb, IFLA_GRE_FWMARK, p->fwmark))
        goto nla_put_failure;

    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;
    }

-   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;

 nla_put_failure:

Leave a Reply

Your email address will not be published. Required fields are marked *