|
@@ -695,7 +695,7 @@ static int gelic_wl_get_scan(struct net_device *netdev,
|
|
|
unsigned long this_time = jiffies;
|
|
|
|
|
|
pr_debug("%s: <-\n", __func__);
|
|
|
- if (down_interruptible(&wl->scan_lock))
|
|
|
+ if (mutex_lock_interruptible(&wl->scan_lock))
|
|
|
return -EAGAIN;
|
|
|
|
|
|
switch (wl->scan_stat) {
|
|
@@ -733,7 +733,7 @@ static int gelic_wl_get_scan(struct net_device *netdev,
|
|
|
wrqu->data.length = ev - extra;
|
|
|
wrqu->data.flags = 0;
|
|
|
out:
|
|
|
- up(&wl->scan_lock);
|
|
|
+ mutex_unlock(&wl->scan_lock);
|
|
|
pr_debug("%s: -> %d %d\n", __func__, ret, wrqu->data.length);
|
|
|
return ret;
|
|
|
}
|
|
@@ -1554,7 +1554,7 @@ static int gelic_wl_start_scan(struct gelic_wl_info *wl, int always_scan)
|
|
|
int ret = 0;
|
|
|
|
|
|
pr_debug("%s: <- always=%d\n", __func__, always_scan);
|
|
|
- if (down_interruptible(&wl->scan_lock))
|
|
|
+ if (mutex_lock_interruptible(&wl->scan_lock))
|
|
|
return -ERESTARTSYS;
|
|
|
|
|
|
/*
|
|
@@ -1588,7 +1588,7 @@ static int gelic_wl_start_scan(struct gelic_wl_info *wl, int always_scan)
|
|
|
}
|
|
|
kfree(cmd);
|
|
|
out:
|
|
|
- up(&wl->scan_lock);
|
|
|
+ mutex_unlock(&wl->scan_lock);
|
|
|
pr_debug("%s: ->\n", __func__);
|
|
|
return ret;
|
|
|
}
|
|
@@ -1610,7 +1610,7 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
|
|
|
DECLARE_MAC_BUF(mac);
|
|
|
|
|
|
pr_debug("%s:start\n", __func__);
|
|
|
- down(&wl->scan_lock);
|
|
|
+ mutex_lock(&wl->scan_lock);
|
|
|
|
|
|
if (wl->scan_stat != GELIC_WL_SCAN_STAT_SCANNING) {
|
|
|
/*
|
|
@@ -1727,7 +1727,7 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
|
|
|
NULL);
|
|
|
out:
|
|
|
complete(&wl->scan_done);
|
|
|
- up(&wl->scan_lock);
|
|
|
+ mutex_unlock(&wl->scan_lock);
|
|
|
pr_debug("%s:end\n", __func__);
|
|
|
}
|
|
|
|
|
@@ -2282,7 +2282,7 @@ static void gelic_wl_assoc_worker(struct work_struct *work)
|
|
|
wait_for_completion(&wl->scan_done);
|
|
|
|
|
|
pr_debug("%s: scan done\n", __func__);
|
|
|
- down(&wl->scan_lock);
|
|
|
+ mutex_lock(&wl->scan_lock);
|
|
|
if (wl->scan_stat != GELIC_WL_SCAN_STAT_GOT_LIST) {
|
|
|
gelic_wl_send_iwap_event(wl, NULL);
|
|
|
pr_info("%s: no scan list. association failed\n", __func__);
|
|
@@ -2302,7 +2302,7 @@ static void gelic_wl_assoc_worker(struct work_struct *work)
|
|
|
if (ret)
|
|
|
pr_info("%s: association failed %d\n", __func__, ret);
|
|
|
scan_lock_out:
|
|
|
- up(&wl->scan_lock);
|
|
|
+ mutex_unlock(&wl->scan_lock);
|
|
|
out:
|
|
|
up(&wl->assoc_stat_lock);
|
|
|
}
|
|
@@ -2431,7 +2431,7 @@ static struct net_device *gelic_wl_alloc(struct gelic_card *card)
|
|
|
|
|
|
INIT_DELAYED_WORK(&wl->event_work, gelic_wl_event_worker);
|
|
|
INIT_DELAYED_WORK(&wl->assoc_work, gelic_wl_assoc_worker);
|
|
|
- init_MUTEX(&wl->scan_lock);
|
|
|
+ mutex_init(&wl->scan_lock);
|
|
|
init_MUTEX(&wl->assoc_stat_lock);
|
|
|
|
|
|
init_completion(&wl->scan_done);
|