wimax/i2400m: introduce i2400m_reset(), stopping TX and carrier

Currently the i2400m driver was resetting by just calling
i2400m->bus_reset(). However, this was missing stopping the TX queue
and downing the carrier. This was causing, for the corner case of the
driver reseting a device that refuses to go out of idle mode, that a
few packets would be queued and more than one reset would go through,
making the recovery a wee bit messy.

To avoid introducing the same cleanup in all the bus-specific driver,
introduced a i2400m_reset() function that takes care of house cleaning
and then calling the bus-level reset implementation.

The bulk of the changes in all files are just to rename the call from
i2400m->bus_reset() to i2400m_reset().

Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index 64a44ca00675..e3d2a9de023c 100644
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -828,7 +828,7 @@ void i2400m_roq_queue(struct i2400m *i2400m, struct i2400m_roq *roq,
                 dev_err(dev, "SW BUG? queue nsn %d (lbn %u ws %u)\n",
                         nsn, lbn, roq->ws);
                 i2400m_roq_log_dump(i2400m, roq);
-                i2400m->bus_reset(i2400m, I2400M_RT_WARM);
+                i2400m_reset(i2400m, I2400M_RT_WARM);
         } else {
                 __i2400m_roq_queue(i2400m, roq, skb, lbn, nsn);
                 i2400m_roq_log_add(i2400m, roq, I2400M_RO_TYPE_PACKET,
@@ -894,7 +894,7 @@ void i2400m_roq_queue_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq,
                 dev_err(dev, "SW BUG? queue_update_ws nsn %u (sn %u ws %u)\n",
                         nsn, sn, roq->ws);
                 i2400m_roq_log_dump(i2400m, roq);
-                i2400m->bus_reset(i2400m, I2400M_RT_WARM);
+                i2400m_reset(i2400m, I2400M_RT_WARM);
         } else {
                 /* if the queue is empty, don't bother as we'd queue
                  * it and inmediately unqueue it -- just deliver it */