usb: gadget: f_ecm: fix host mac address for multiple instances

In case there are multiple ecm instances, either for multiple
otg controllers, or multiple virtual links using libcomposite,
each instance needs to have its own host mac address string
value for iMACAddress.

Update the source array (ecm_string_defs), every time before
usb_gstrings_attach(). Without that, all links wrongly were
getting the same, last allocated, host mac address, rather
than the correct one, as requested via configfs.

Signed-off-by: Lukasz Nowak <lukasz.nowak@exablue.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
index b104ed0c1ab5a5d331dd6e577be167f8c23f6ee7..6ce044008cf6c4197dda79df4f5f1aab74b846b9 100644 (file)
--- a/drivers/usb/gadget/function/f_ecm.c
+++ b/drivers/usb/gadget/function/f_ecm.c
@@ -705,6 +705,8 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)
                ecm_opts->bound = true;
        }
 
+       ecm_string_defs[1].s = ecm->ethaddr;
+
        us = usb_gstrings_attach(cdev, ecm_strings,
                                 ARRAY_SIZE(ecm_string_defs));
        if (IS_ERR(us))
@@ -928,7 +930,6 @@ static struct usb_function *ecm_alloc(struct usb_function_instance *fi)
                mutex_unlock(&opts->lock);
                return ERR_PTR(-EINVAL);
        }
-       ecm_string_defs[1].s = ecm->ethaddr;
 
        ecm->port.ioport = netdev_priv(opts->net);
        mutex_unlock(&opts->lock);