Re: [PATCH iproute2 net-next-for-3.13 1/2] iplink: display slave information

[Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>]

Hello.

On 10-02-2014 12:11, Michal Kubecek wrote:

> Add print_slave_opt() callback and maxslattr value to struct
> link_util. These are analogous to print_opt() and maxattr but
> relate to slave info (IFLA_INFO_SLAVE_{KIND,DATA}).

> Display the slave specific info in output of "ip -d link show".

> Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
[...]

> diff --git a/ip/ipaddress.c b/ip/ipaddress.c
> index f794fa1..3cb7ee7 100644
> --- a/ip/ipaddress.c
> +++ b/ip/ipaddress.c
[...]
> @@ -221,6 +221,29 @@ static void print_linktype(FILE *fp, struct rtattr *tb)
>   		    lu->print_xstats)
>   			lu->print_xstats(lu, fp, linkinfo[IFLA_INFO_XSTATS]);
>   	}
> +
> +no_info:
> +	if (!linkinfo[IFLA_INFO_SLAVE_KIND])
> +		return;
> +	kind = RTA_DATA(linkinfo[IFLA_INFO_SLAVE_KIND]);
> +
> +	fprintf(fp, "%s", _SL_);
> +	fprintf(fp, "    %s_slave ", kind);
> +
> +	lu = get_link_kind(kind);
> +	if (!lu || !lu->print_slave_opt)
> +		return;
> +
> +	if (1) {

    Why is that?

> +		struct rtattr *attr[lu->maxslattr+1], **data = NULL;
> +
> +		if (linkinfo[IFLA_INFO_SLAVE_DATA]) {
> +			parse_rtattr_nested(attr, lu->maxslattr,
> +					    linkinfo[IFLA_INFO_SLAVE_DATA]);
> +			data = attr;
> +		}
> +		lu->print_slave_opt(lu, fp, data);
> +	}

WBR, Sergei