Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 646106
Collapse All | Expand All

(-)a/src/wl/sys/wl_linux.c (-3 / +15 lines)
Lines 93-99 Link Here
93
93
94
#include <wlc_wowl.h>
94
#include <wlc_wowl.h>
95
95
96
#ifdef HAVE_TIMER_SETUP
97
static void wl_timer(struct timer_list *list);
98
#else
96
static void wl_timer(ulong data);
99
static void wl_timer(ulong data);
100
#endif
97
static void _wl_timer(wl_timer_t *t);
101
static void _wl_timer(wl_timer_t *t);
98
static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
102
static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
99
103
Lines 2296-2307 Link Here
2296
2300
2297
	atomic_dec(&t->wl->callbacks);
2301
	atomic_dec(&t->wl->callbacks);
2298
}
2302
}
2299
2303
#ifdef HAVE_TIMER_SETUP
2304
static void
2305
wl_timer(struct timer_list *list)
2306
{
2307
	wl_timer_t *t = from_timer(t,list,timer);
2308
#else
2300
static void
2309
static void
2301
wl_timer(ulong data)
2310
wl_timer(ulong data)
2302
{
2311
{
2303
	wl_timer_t *t = (wl_timer_t *)data;
2312
	wl_timer_t *t = (wl_timer_t *)data;
2304
2313
#endif
2305
	if (!WL_ALL_PASSIVE_ENAB(t->wl))
2314
	if (!WL_ALL_PASSIVE_ENAB(t->wl))
2306
		_wl_timer(t);
2315
		_wl_timer(t);
2307
	else
2316
	else
Lines 2351-2360 Link Here
2351
	}
2360
	}
2352
2361
2353
	bzero(t, sizeof(wl_timer_t));
2362
	bzero(t, sizeof(wl_timer_t));
2354
2363
#ifdef HAVE_TIMER_SETUP
2364
	timer_setup(&t->timer, wl_timer,0);
2365
#else
2355
	init_timer(&t->timer);
2366
	init_timer(&t->timer);
2356
	t->timer.data = (ulong) t;
2367
	t->timer.data = (ulong) t;
2357
	t->timer.function = wl_timer;
2368
	t->timer.function = wl_timer;
2369
#endif
2358
	t->wl = wl;
2370
	t->wl = wl;
2359
	t->fn = fn;
2371
	t->fn = fn;
2360
	t->arg = arg;
2372
	t->arg = arg;
(-)a/src/wl/sys/wl_linux.h (+4 lines)
Lines 190-192 Link Here
190
extern struct net_device * wl_netdev_get(wl_info_t *wl);
190
extern struct net_device * wl_netdev_get(wl_info_t *wl);
191
191
192
#endif 
192
#endif 
193
194
#if defined(timer_setup) && defined(from_timer)
195
#define HAVE_TIMER_SETUP
196
#endif

Return to bug 646106