utils: ll_addr: Handle ARPHRD_IP6GRE in ll_addr_n2a()

ll_addr_n2a() correctly prints tunnel endpoints for gre, ipip, sit
and ip6tnl, but not for ip6gre. Fix this by adding ARPHRD_IP6GRE to
IPv6 tunnel endpoing address conversion.

Before:
-------

$ ip link show
...
18: ip6tnl0: <NOARP> mtu 1452 qdisc noop state DOWN mode DEFAULT group default
    link/tunnel6 :: brd ::
19: ip6gre0: <NOARP> mtu 1456 qdisc noop state DOWN mode DEFAULT group default
    link/gre6 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 brd \
00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00

After:
------

$ ip link show
...
18: ip6tnl0: <NOARP> mtu 1452 qdisc noop state DOWN mode DEFAULT group default
    link/tunnel6 :: brd ::
19: ip6gre0: <NOARP> mtu 1456 qdisc noop state DOWN mode DEFAULT group default
    link/gre6 :: brd ::

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>

diff --git a/lib/ll_addr.c b/lib/ll_addr.c
index c03523d567ab0edd9b5db12541cae4ae2b5f53a1..84de64e2e05373feb9265ae243282885b3e19e8a 100644 (file)
--- a/lib/ll_addr.c
+++ b/lib/ll_addr.c
@@ -36,7 +36,8 @@ const char *ll_addr_n2a(const unsigned char *addr, int alen, int type, char *buf
            (type == ARPHRD_TUNNEL || type == ARPHRD_SIT || type == ARPHRD_IPGRE)) {
                return inet_ntop(AF_INET, addr, buf, blen);
        }
-       if (alen == 16 && type == ARPHRD_TUNNEL6) {
+       if (alen == 16 &&
+           (type == ARPHRD_TUNNEL6 || type == ARPHRD_IP6GRE)) {
                return inet_ntop(AF_INET6, addr, buf, blen);
        }
        snprintf(buf, blen, "%02x", addr[0]);