xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Inaky Perez-Gonzalez
2009-10-19 16:24:56 +09:00
parent 55a662d646
commit c931ceeb78
9 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/wimax/i2400m/driver.c
View File

@@ -255,7 +255,7 @@ int i2400m_op_reset(struct wimax_dev *wimax_dev)
mutex_lock(&i2400m->init_mutex);
i2400m->reset_ctx = &ctx;
mutex_unlock(&i2400m->init_mutex);
result = i2400m->bus_reset(i2400m, I2400M_RT_WARM);
result = i2400m_reset(i2400m, I2400M_RT_WARM);
if (result < 0)
goto out;
result = wait_for_completion_timeout(&ctx.completion, 4*HZ);
@@ -710,7 +710,7 @@ out_unlock:
mutex_unlock(&i2400m->init_mutex);
if (result == -EUCLEAN) {
/* ops, need to clean up [w/ init_mutex not held] */
result = i2400m->bus_reset(i2400m, I2400M_RT_BUS);
result = i2400m_reset(i2400m, I2400M_RT_BUS);
if (result >= 0)
result = -ENODEV;
}
@@ -815,6 +815,24 @@ void i2400m_init(struct i2400m *i2400m)
EXPORT_SYMBOL_GPL(i2400m_init);
int i2400m_reset(struct i2400m *i2400m, enum i2400m_reset_type rt)
{
struct net_device *net_dev = i2400m->wimax_dev.net_dev;
/*
* Make sure we stop TXs and down the carrier before
* resetting; this is needed to avoid things like
* i2400m_wake_tx() scheduling stuff in parallel.
*/
if (net_dev->reg_state == NETREG_REGISTERED) {
netif_tx_disable(net_dev);
netif_carrier_off(net_dev);
}
return i2400m->bus_reset(i2400m, rt);
}
EXPORT_SYMBOL_GPL(i2400m_reset);
/**
* i2400m_setup - bus-generic setup function for the i2400m device
*