Amitkumar Karwar <akarwar@xxxxxxxxxxx> writes: > From: Ganapathi Bhat <gbhat@xxxxxxxxxxx> > > Similar to pcie8997 chipset, first firmware submitted for usb8997 > chipset will be usbusb8997_combo_v4.bin. This patch corrects the > name used in driver. > > Signed-off-by: Ganapathi Bhat <gbhat@xxxxxxxxxxx> > Signed-off-by: Amitkumar Karwar <akarwar@xxxxxxxxxxx> > --- > drivers/net/wireless/marvell/mwifiex/usb.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/marvell/mwifiex/usb.h b/drivers/net/wireless/marvell/mwifiex/usb.h > index 1b49c52..30e8eb8 100644 > --- a/drivers/net/wireless/marvell/mwifiex/usb.h > +++ b/drivers/net/wireless/marvell/mwifiex/usb.h > @@ -46,7 +46,7 @@ > #define USB8766_DEFAULT_FW_NAME "mrvl/usb8766_uapsta.bin" > #define USB8797_DEFAULT_FW_NAME "mrvl/usb8797_uapsta.bin" > #define USB8801_DEFAULT_FW_NAME "mrvl/usb8801_uapsta.bin" > -#define USB8997_DEFAULT_FW_NAME "mrvl/usb8997_uapsta.bin" > +#define USB8997_DEFAULT_FW_NAME "mrvl/usbusb8997_combo_v4.bin" Like discussed earlier, the firmware names are supposed to be stable. I consider them to be an interface between kernel and user space. Instead of changing the driver you should actually rename the firmware file. I'm planning to take this anyway but in the future please pay extra attention to do this properly. My recommendation is to keep the firmware name simple as possible and get rid of any extra cruft, for example in this case a good name would be "mrvl/usb8997.bin". That extra "usb" and "combo_v4" don't bring any benefit. -- Kalle Valo
