Commit 10e52ad5 authored by Lukasz Majewski's avatar Lukasz Majewski Committed by David S. Miller
Browse files

net: hsr: Use full string description when opening HSR network device 



Up till now only single character ('A' or 'B') was used to provide
information of HSR slave network device status.

As it is also possible and valid, that Interlink network device may
be supported as well, the description must be more verbose. As a result
the full string description is now used.

Signed-off-by: default avatarLukasz Majewski <lukma@denx.de>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ae289b0

net/hsr/hsr_device.c

+6 −7
Original line number Diff line number Diff line
@@ -132,30 +132,29 @@ static int hsr_dev_open(struct net_device *dev) 
{

	struct hsr_priv *hsr;

	struct hsr_port *port;

	char designation;

	const char *designation = NULL;



	hsr = netdev_priv(dev);

	designation = '\0';



	hsr_for_each_port(hsr, port) {

		if (port->type == HSR_PT_MASTER)

			continue;

		switch (port->type) {

		case HSR_PT_SLAVE_A:

			designation = 'A';

			designation = "Slave A";

			break;

		case HSR_PT_SLAVE_B:

			designation = 'B';

			designation = "Slave B";

			break;

		default:

			designation = '?';

			designation = "Unknown";

		}

		if (!is_slave_up(port->dev))

			netdev_warn(dev, "Slave %c (%s) is not up; please bring it up to get a fully working HSR network\n",

			netdev_warn(dev, "%s (%s) is not up; please bring it up to get a fully working HSR network\n",

				    designation, port->dev->name);

	}



	if (designation == '\0')

	if (!designation)

		netdev_warn(dev, "No slave devices configured\n");



	return 0;