Re: [PATCH] net: hsr: Use full string description when opening HSR network device

From: Ravi Gunasekaran
Date: Mon Mar 04 2024 - 05:34:16 EST




On 3/4/24 3:02 PM, Lukasz Majewski wrote:
> 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@xxxxxxx>
> ---
> net/hsr/hsr_device.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
> index 9d71b66183da..9a60489fba96 100644
> --- a/net/hsr/hsr_device.c
> +++ b/net/hsr/hsr_device.c
> @@ -142,30 +142,29 @@ static int hsr_dev_open(struct net_device *dev)
> {
> struct hsr_priv *hsr;
> struct hsr_port *port;
> - char designation;
> + 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";

"designation" is now a pointer and is being assigned value
without even allocating memory for it.

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

--
Regards,
Ravi