diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-30 14:14:38 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 21:51:49 (GMT) |
| commit | 1e8a2b60339a050f4fd383e332a5dd66b75f4f02 (patch) | |
| tree | 4caedc94ac170b32d18336833c9387a10b532078 /drivers/staging/winbond/rxisr.c | |
| parent | ac418b8faaaad7a17474c8fba5c2e5917c91cf31 (diff) | |
| download | linux-fsl-qoriq-1e8a2b60339a050f4fd383e332a5dd66b75f4f02.tar.xz | |
Staging: w35und: merge struct wb35_adapter to struct wbsoft_priv
This patch merges struct wb35_adapter to struct wbsoft_priv. Now we can finally
start passing a pointer to struct ieee80211_hw around where necessary.
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond/rxisr.c')
| -rw-r--r-- | drivers/staging/winbond/rxisr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/winbond/rxisr.c b/drivers/staging/winbond/rxisr.c index f5c98d9..d591003 100644 --- a/drivers/staging/winbond/rxisr.c +++ b/drivers/staging/winbond/rxisr.c @@ -1,19 +1,19 @@ #include "os_common.h" -#include "adapter.h" +#include "core.h" static void RxTimerHandler(unsigned long data) { WARN_ON(1); } -void vRxTimerInit(struct wb35_adapter *adapter) +void vRxTimerInit(struct wbsoft_priv *adapter) { init_timer(&adapter->Mds.timer); adapter->Mds.timer.function = RxTimerHandler; adapter->Mds.timer.data = (unsigned long) adapter; } -void vRxTimerStart(struct wb35_adapter *adapter, int timeout_value) +void vRxTimerStart(struct wbsoft_priv *adapter, int timeout_value) { if (timeout_value < MIN_TIMEOUT_VAL) timeout_value = MIN_TIMEOUT_VAL; @@ -22,7 +22,7 @@ void vRxTimerStart(struct wb35_adapter *adapter, int timeout_value) add_timer(&adapter->Mds.timer); } -void vRxTimerStop(struct wb35_adapter *adapter) +void vRxTimerStop(struct wbsoft_priv *adapter) { del_timer_sync(&adapter->Mds.timer); } |