View | Details | Raw Unified | Return to bug 146880
Collapse All | Expand All

(-)linux-2.6.15/drivers/net/wireless/ipw2200.c (-8 / +6 lines)
Lines 8940-8953 static int ipw_request_direct_scan(struc Link Here
8940
	IPW_DEBUG_HC("starting request direct scan!\n");
8940
	IPW_DEBUG_HC("starting request direct scan!\n");
8941
8941
8942
	if (priv->status & (STATUS_SCANNING | STATUS_SCAN_ABORTING)) {
8942
	if (priv->status & (STATUS_SCANNING | STATUS_SCAN_ABORTING)) {
8943
		err = wait_event_interruptible(priv->wait_state,
8943
		/* We should not sleep here; otherwise we will block most
8944
					       !(priv->
8944
		 * of the system (for instance, we hold rtnl_lock when we
8945
						 status & (STATUS_SCANNING |
8945
		 * get here).
8946
							   STATUS_SCAN_ABORTING)));
8946
		 */
8947
		if (err) {
8947
		err = -EAGAIN;
8948
			IPW_DEBUG_HC("aborting direct scan");
8948
		goto done;
8949
			goto done;
8950
		}
8951
	}
8949
	}
8952
	memset(&scan, 0, sizeof(scan));
8950
	memset(&scan, 0, sizeof(scan));
8953
8951

Return to bug 146880