wimax/i2400m: drop support for deprecated major fw interface, add for new minor

[linux-2.6-omap-h63xx.git] / drivers / net / wimax / i2400m / control.c

diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c
index d3d37fed689382db0f61d1eb045e5ea0ae5c87a8..ac8fb6d07e617f3771f301a766455da737c76d6e 100644 (file)
--- a/drivers/net/wimax/i2400m/control.c
+++ b/drivers/net/wimax/i2400m/control.c
@@ -609,7 +609,7 @@ void i2400m_msg_to_dev_cancel_wait(struct i2400m *i2400m, int code)
        spin_lock_irqsave(&i2400m->rx_lock, flags);
        ack_skb = i2400m->ack_skb;
        if (ack_skb && !IS_ERR(ack_skb))
-               kfree(ack_skb);
+               kfree_skb(ack_skb);
        i2400m->ack_skb = ERR_PTR(code);
        spin_unlock_irqrestore(&i2400m->rx_lock, flags);
 }
@@ -942,8 +942,8 @@ error_cmd_failed:
 /* Firmware interface versions we support */
 enum {
        I2400M_HDIv_MAJOR = 9,
-       I2400M_HDIv_MAJOR_2 = 8,
        I2400M_HDIv_MINOR = 1,
+       I2400M_HDIv_MINOR_2 = 2,
 };
 
 
@@ -1009,18 +1009,14 @@ int i2400m_firmware_check(struct i2400m *i2400m)
        minor = le16_to_cpu(l4mv->minor);
        branch = le16_to_cpu(l4mv->branch);
        result = -EINVAL;
-       if (major != I2400M_HDIv_MAJOR
-           && major != I2400M_HDIv_MAJOR_2) {
-               dev_err(dev, "unsupported major fw interface version "
+       if (major != I2400M_HDIv_MAJOR) {
+               dev_err(dev, "unsupported major fw version "
                        "%u.%u.%u\n", major, minor, branch);
                goto error_bad_major;
        }
-       if (major == I2400M_HDIv_MAJOR_2)
-               dev_err(dev, "deprecated major fw interface version "
-                       "%u.%u.%u\n", major, minor, branch);
        result = 0;
-       if (minor != I2400M_HDIv_MINOR)
-               dev_warn(dev, "untested minor fw firmware version %u.%u.%u\n",
+       if (minor < I2400M_HDIv_MINOR_2 && minor > I2400M_HDIv_MINOR)
+               dev_warn(dev, "untested minor fw version %u.%u.%u\n",
                         major, minor, branch);
 error_bad_major:
        dev_info(dev, "firmware interface version %u.%u.%u\n",