diff options
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index d8afcdfca1ed..0133fcd4601b 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -569,7 +569,7 @@ static int dl_startup_params(struct net_device *dev) | |||
569 | local->card_status = CARD_DL_PARAM; | 569 | local->card_status = CARD_DL_PARAM; |
570 | /* Start kernel timer to wait for dl startup to complete. */ | 570 | /* Start kernel timer to wait for dl startup to complete. */ |
571 | local->timer.expires = jiffies + HZ / 2; | 571 | local->timer.expires = jiffies + HZ / 2; |
572 | local->timer.function = (TIMER_FUNC_TYPE)verify_dl_startup; | 572 | local->timer.function = verify_dl_startup; |
573 | add_timer(&local->timer); | 573 | add_timer(&local->timer); |
574 | dev_dbg(&link->dev, | 574 | dev_dbg(&link->dev, |
575 | "ray_cs dl_startup_params started timer for verify_dl_startup\n"); | 575 | "ray_cs dl_startup_params started timer for verify_dl_startup\n"); |
@@ -1947,12 +1947,12 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id) | |||
1947 | dev_dbg(&link->dev, | 1947 | dev_dbg(&link->dev, |
1948 | "ray_cs interrupt network \"%s\" start failed\n", | 1948 | "ray_cs interrupt network \"%s\" start failed\n", |
1949 | memtmp); | 1949 | memtmp); |
1950 | local->timer.function = (TIMER_FUNC_TYPE)start_net; | 1950 | local->timer.function = start_net; |
1951 | } else { | 1951 | } else { |
1952 | dev_dbg(&link->dev, | 1952 | dev_dbg(&link->dev, |
1953 | "ray_cs interrupt network \"%s\" join failed\n", | 1953 | "ray_cs interrupt network \"%s\" join failed\n", |
1954 | memtmp); | 1954 | memtmp); |
1955 | local->timer.function = (TIMER_FUNC_TYPE)join_net; | 1955 | local->timer.function = join_net; |
1956 | } | 1956 | } |
1957 | add_timer(&local->timer); | 1957 | add_timer(&local->timer); |
1958 | } | 1958 | } |
@@ -2417,9 +2417,9 @@ static void authenticate(ray_dev_t *local) | |||
2417 | 2417 | ||
2418 | del_timer(&local->timer); | 2418 | del_timer(&local->timer); |
2419 | if (build_auth_frame(local, local->bss_id, OPEN_AUTH_REQUEST)) { | 2419 | if (build_auth_frame(local, local->bss_id, OPEN_AUTH_REQUEST)) { |
2420 | local->timer.function = (TIMER_FUNC_TYPE)join_net; | 2420 | local->timer.function = join_net; |
2421 | } else { | 2421 | } else { |
2422 | local->timer.function = (TIMER_FUNC_TYPE)authenticate_timeout; | 2422 | local->timer.function = authenticate_timeout; |
2423 | } | 2423 | } |
2424 | local->timer.expires = jiffies + HZ * 2; | 2424 | local->timer.expires = jiffies + HZ * 2; |
2425 | add_timer(&local->timer); | 2425 | add_timer(&local->timer); |
@@ -2502,7 +2502,7 @@ static void associate(ray_dev_t *local) | |||
2502 | 2502 | ||
2503 | del_timer(&local->timer); | 2503 | del_timer(&local->timer); |
2504 | local->timer.expires = jiffies + HZ * 2; | 2504 | local->timer.expires = jiffies + HZ * 2; |
2505 | local->timer.function = (TIMER_FUNC_TYPE)join_net; | 2505 | local->timer.function = join_net; |
2506 | add_timer(&local->timer); | 2506 | add_timer(&local->timer); |
2507 | local->card_status = CARD_ASSOC_FAILED; | 2507 | local->card_status = CARD_ASSOC_FAILED; |
2508 | return; | 2508 | return; |