On Tue, 2012-11-27 at 15:52 +0200, Luciano Coelho wrote: > For wl18xx, only the chip ID and the minor version number are > relevant. Ignore the other numbers which are either not used or > relate to internal projects or internal branches. > > Signed-off-by: Luciano Coelho <coelho@xxxxxx> > --- > drivers/net/wireless/ti/wl18xx/wl18xx.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/ti/wl18xx/wl18xx.h b/drivers/net/wireless/ti/wl18xx/wl18xx.h > index 96a1e43..5d87bd3 100644 > --- a/drivers/net/wireless/ti/wl18xx/wl18xx.h > +++ b/drivers/net/wireless/ti/wl18xx/wl18xx.h > @@ -26,9 +26,9 @@ > > /* minimum FW required for driver */ > #define WL18XX_CHIP_VER 8 > -#define WL18XX_IFTYPE_VER 2 > -#define WL18XX_MAJOR_VER 0 > -#define WL18XX_SUBTYPE_VER 0 > +#define WL18XX_IFTYPE_VER WLCORE_FW_VER_IGNORE > +#define WL18XX_MAJOR_VER WLCORE_FW_VER_IGNORE > +#define WL18XX_SUBTYPE_VER WLCORE_FW_VER_IGNORE > #define WL18XX_MINOR_VER 100 While merging this on top of the wl18xx FW API changes patchset, I noticed that the version has already changed. We can't ignore IFTYPE because MINOR has been restarted from zero. So, this patch was applied like this: diff --git a/drivers/net/wireless/ti/wl18xx/wl18xx.h b/drivers/net/wireless/ti/wl18xx/wl18xx.h index 4d295a5..3105fbf 100644 --- a/drivers/net/wireless/ti/wl18xx/wl18xx.h +++ b/drivers/net/wireless/ti/wl18xx/wl18xx.h @@ -27,8 +27,8 @@ /* minimum FW required for driver */ #define WL18XX_CHIP_VER 8 #define WL18XX_IFTYPE_VER 5 -#define WL18XX_MAJOR_VER 0 -#define WL18XX_SUBTYPE_VER 0 +#define WL18XX_MAJOR_VER WLCORE_FW_VER_IGNORE +#define WL18XX_SUBTYPE_VER WLCORE_FW_VER_IGNORE #define WL18XX_MINOR_VER 28 #define WL18XX_CMD_MAX_SIZE 740 -- Luca. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
