|
@@ -435,47 +435,6 @@ static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev,
|
|
return retval;
|
|
return retval;
|
|
}
|
|
}
|
|
|
|
|
|
-/*
|
|
|
|
- * Watchdog handlers
|
|
|
|
- */
|
|
|
|
-static void rt2800usb_watchdog(struct rt2x00_dev *rt2x00dev)
|
|
|
|
-{
|
|
|
|
- unsigned int i;
|
|
|
|
- u32 reg;
|
|
|
|
-
|
|
|
|
- rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, ®);
|
|
|
|
- if (rt2x00_get_field32(reg, TXRXQ_PCNT_TX0Q)) {
|
|
|
|
- rt2x00_warn(rt2x00dev, "TX HW queue 0 timed out, invoke forced kick\n");
|
|
|
|
-
|
|
|
|
- rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf40012);
|
|
|
|
-
|
|
|
|
- for (i = 0; i < 10; i++) {
|
|
|
|
- udelay(10);
|
|
|
|
- if (!rt2x00_get_field32(reg, TXRXQ_PCNT_TX0Q))
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf40006);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, ®);
|
|
|
|
- if (rt2x00_get_field32(reg, TXRXQ_PCNT_TX1Q)) {
|
|
|
|
- rt2x00_warn(rt2x00dev, "TX HW queue 1 timed out, invoke forced kick\n");
|
|
|
|
-
|
|
|
|
- rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf4000a);
|
|
|
|
-
|
|
|
|
- for (i = 0; i < 10; i++) {
|
|
|
|
- udelay(10);
|
|
|
|
- if (!rt2x00_get_field32(reg, TXRXQ_PCNT_TX1Q))
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf40006);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- rt2x00usb_watchdog(rt2x00dev);
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* TX descriptor initialization
|
|
* TX descriptor initialization
|
|
*/
|
|
*/
|
|
@@ -877,7 +836,6 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {
|
|
.link_tuner = rt2800_link_tuner,
|
|
.link_tuner = rt2800_link_tuner,
|
|
.gain_calibration = rt2800_gain_calibration,
|
|
.gain_calibration = rt2800_gain_calibration,
|
|
.vco_calibration = rt2800_vco_calibration,
|
|
.vco_calibration = rt2800_vco_calibration,
|
|
- .watchdog = rt2800usb_watchdog,
|
|
|
|
.start_queue = rt2800usb_start_queue,
|
|
.start_queue = rt2800usb_start_queue,
|
|
.kick_queue = rt2x00usb_kick_queue,
|
|
.kick_queue = rt2x00usb_kick_queue,
|
|
.stop_queue = rt2800usb_stop_queue,
|
|
.stop_queue = rt2800usb_stop_queue,
|