diff options
| author | Lukasz Majewski <lukma@denx.de> | 2024-03-26 09:56:49 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-03-29 10:42:21 +0000 |
| commit | 10e52ad5ced2a7dcdb3fb18c9cef111d5f30471d (patch) | |
| tree | e29dba3736a93271ed087b75247513bfb3aa1972 /net/hsr | |
| parent | 1ae289b0b01d99756997bdb9536c5d09d264dbfd (diff) | |
| download | linux-10e52ad5ced2a7dcdb3fb18c9cef111d5f30471d.tar.gz linux-10e52ad5ced2a7dcdb3fb18c9cef111d5f30471d.tar.bz2 linux-10e52ad5ced2a7dcdb3fb18c9cef111d5f30471d.zip | |
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: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr')
| -rw-r--r-- | net/hsr/hsr_device.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index c98b5b71ad7c..e9d45133d641 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -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; |