summaryrefslogtreecommitdiffstats
path: root/drivers/staging/winbond/wblinux.c
diff options
context:
space:
mode:
authorPekka Enberg2008-10-30 15:14:38 +0100
committerGreg Kroah-Hartman2009-01-06 22:51:49 +0100
commit1e8a2b60339a050f4fd383e332a5dd66b75f4f02 (patch)
tree4caedc94ac170b32d18336833c9387a10b532078 /drivers/staging/winbond/wblinux.c
parentStaging: w35und: clean up adapter.h a bit (diff)
downloadkernel-qcow2-linux-1e8a2b60339a050f4fd383e332a5dd66b75f4f02.tar.gz
kernel-qcow2-linux-1e8a2b60339a050f4fd383e332a5dd66b75f4f02.tar.xz
kernel-qcow2-linux-1e8a2b60339a050f4fd383e332a5dd66b75f4f02.zip
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/wblinux.c')
-rw-r--r--drivers/staging/winbond/wblinux.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/winbond/wblinux.c b/drivers/staging/winbond/wblinux.c
index d6894f9da832..594c0692a93d 100644
--- a/drivers/staging/winbond/wblinux.c
+++ b/drivers/staging/winbond/wblinux.c
@@ -17,14 +17,14 @@
#include "wblinux_f.h"
unsigned char
-WBLINUX_Initial(struct wb35_adapter * adapter)
+WBLINUX_Initial(struct wbsoft_priv * adapter)
{
spin_lock_init( &adapter->SpinLock );
return true;
}
void
-WBLINUX_Destroy(struct wb35_adapter * adapter)
+WBLINUX_Destroy(struct wbsoft_priv * adapter)
{
WBLINUX_stop( adapter );
#ifdef _PE_USB_INI_DUMP_
@@ -33,7 +33,7 @@ WBLINUX_Destroy(struct wb35_adapter * adapter)
}
void
-WBLINUX_stop( struct wb35_adapter * adapter )
+WBLINUX_stop( struct wbsoft_priv * adapter )
{
struct sk_buff *pSkb;
@@ -63,7 +63,7 @@ WBLINUX_stop( struct wb35_adapter * adapter )
}
void
-WbWlanHalt(struct wb35_adapter *adapter)
+WbWlanHalt( struct wbsoft_priv * adapter )
{
//---------------------
adapter->sLocalPara.ShutDowned = true;
@@ -85,7 +85,7 @@ WbWlanHalt(struct wb35_adapter *adapter)
}
unsigned char
-WbWLanInitialize(struct wb35_adapter *adapter)
+WbWLanInitialize(struct wbsoft_priv * adapter)
{
phw_data_t pHwData;
u8 *pMacAddr;