diff options
Diffstat (limited to 'drivers/net/wimax')
-rw-r--r-- | drivers/net/wimax/i2400m/control.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c index 15d9f51b292c..ac8fb6d07e61 100644 --- a/drivers/net/wimax/i2400m/control.c +++ b/drivers/net/wimax/i2400m/control.c | |||
@@ -942,8 +942,8 @@ error_cmd_failed: | |||
942 | /* Firmware interface versions we support */ | 942 | /* Firmware interface versions we support */ |
943 | enum { | 943 | enum { |
944 | I2400M_HDIv_MAJOR = 9, | 944 | I2400M_HDIv_MAJOR = 9, |
945 | I2400M_HDIv_MAJOR_2 = 8, | ||
946 | I2400M_HDIv_MINOR = 1, | 945 | I2400M_HDIv_MINOR = 1, |
946 | I2400M_HDIv_MINOR_2 = 2, | ||
947 | }; | 947 | }; |
948 | 948 | ||
949 | 949 | ||
@@ -1009,18 +1009,14 @@ int i2400m_firmware_check(struct i2400m *i2400m) | |||
1009 | minor = le16_to_cpu(l4mv->minor); | 1009 | minor = le16_to_cpu(l4mv->minor); |
1010 | branch = le16_to_cpu(l4mv->branch); | 1010 | branch = le16_to_cpu(l4mv->branch); |
1011 | result = -EINVAL; | 1011 | result = -EINVAL; |
1012 | if (major != I2400M_HDIv_MAJOR | 1012 | if (major != I2400M_HDIv_MAJOR) { |
1013 | && major != I2400M_HDIv_MAJOR_2) { | 1013 | dev_err(dev, "unsupported major fw version " |
1014 | dev_err(dev, "unsupported major fw interface version " | ||
1015 | "%u.%u.%u\n", major, minor, branch); | 1014 | "%u.%u.%u\n", major, minor, branch); |
1016 | goto error_bad_major; | 1015 | goto error_bad_major; |
1017 | } | 1016 | } |
1018 | if (major == I2400M_HDIv_MAJOR_2) | ||
1019 | dev_err(dev, "deprecated major fw interface version " | ||
1020 | "%u.%u.%u\n", major, minor, branch); | ||
1021 | result = 0; | 1017 | result = 0; |
1022 | if (minor != I2400M_HDIv_MINOR) | 1018 | if (minor < I2400M_HDIv_MINOR_2 && minor > I2400M_HDIv_MINOR) |
1023 | dev_warn(dev, "untested minor fw firmware version %u.%u.%u\n", | 1019 | dev_warn(dev, "untested minor fw version %u.%u.%u\n", |
1024 | major, minor, branch); | 1020 | major, minor, branch); |
1025 | error_bad_major: | 1021 | error_bad_major: |
1026 | dev_info(dev, "firmware interface version %u.%u.%u\n", | 1022 | dev_info(dev, "firmware interface version %u.%u.%u\n", |