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 3bd9cf76517..d91a831a770 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -604,7 +604,7 @@ static int dl_startup_params(struct net_device *dev) | |||
604 | /* Start kernel timer to wait for dl startup to complete. */ | 604 | /* Start kernel timer to wait for dl startup to complete. */ |
605 | local->timer.expires = jiffies + HZ / 2; | 605 | local->timer.expires = jiffies + HZ / 2; |
606 | local->timer.data = (long)local; | 606 | local->timer.data = (long)local; |
607 | local->timer.function = &verify_dl_startup; | 607 | local->timer.function = verify_dl_startup; |
608 | add_timer(&local->timer); | 608 | add_timer(&local->timer); |
609 | dev_dbg(&link->dev, | 609 | dev_dbg(&link->dev, |
610 | "ray_cs dl_startup_params started timer for verify_dl_startup\n"); | 610 | "ray_cs dl_startup_params started timer for verify_dl_startup\n"); |
@@ -1981,12 +1981,12 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id) | |||
1981 | dev_dbg(&link->dev, | 1981 | dev_dbg(&link->dev, |
1982 | "ray_cs interrupt network \"%s\" start failed\n", | 1982 | "ray_cs interrupt network \"%s\" start failed\n", |
1983 | local->sparm.b4.a_current_ess_id); | 1983 | local->sparm.b4.a_current_ess_id); |
1984 | local->timer.function = &start_net; | 1984 | local->timer.function = start_net; |
1985 | } else { | 1985 | } else { |
1986 | dev_dbg(&link->dev, | 1986 | dev_dbg(&link->dev, |
1987 | "ray_cs interrupt network \"%s\" join failed\n", | 1987 | "ray_cs interrupt network \"%s\" join failed\n", |
1988 | local->sparm.b4.a_current_ess_id); | 1988 | local->sparm.b4.a_current_ess_id); |
1989 | local->timer.function = &join_net; | 1989 | local->timer.function = join_net; |
1990 | } | 1990 | } |
1991 | add_timer(&local->timer); | 1991 | add_timer(&local->timer); |
1992 | } | 1992 | } |
@@ -2454,9 +2454,9 @@ static void authenticate(ray_dev_t *local) | |||
2454 | 2454 | ||
2455 | del_timer(&local->timer); | 2455 | del_timer(&local->timer); |
2456 | if (build_auth_frame(local, local->bss_id, OPEN_AUTH_REQUEST)) { | 2456 | if (build_auth_frame(local, local->bss_id, OPEN_AUTH_REQUEST)) { |
2457 | local->timer.function = &join_net; | 2457 | local->timer.function = join_net; |
2458 | } else { | 2458 | } else { |
2459 | local->timer.function = &authenticate_timeout; | 2459 | local->timer.function = authenticate_timeout; |
2460 | } | 2460 | } |
2461 | local->timer.expires = jiffies + HZ * 2; | 2461 | local->timer.expires = jiffies + HZ * 2; |
2462 | local->timer.data = (long)local; | 2462 | local->timer.data = (long)local; |
@@ -2541,7 +2541,7 @@ static void associate(ray_dev_t *local) | |||
2541 | del_timer(&local->timer); | 2541 | del_timer(&local->timer); |
2542 | local->timer.expires = jiffies + HZ * 2; | 2542 | local->timer.expires = jiffies + HZ * 2; |
2543 | local->timer.data = (long)local; | 2543 | local->timer.data = (long)local; |
2544 | local->timer.function = &join_net; | 2544 | local->timer.function = join_net; |
2545 | add_timer(&local->timer); | 2545 | add_timer(&local->timer); |
2546 | local->card_status = CARD_ASSOC_FAILED; | 2546 | local->card_status = CARD_ASSOC_FAILED; |
2547 | return; | 2547 | return; |