diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-30 16:14:38 +0200 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-19 10:34:09 +1100 |
commit | 44724c99fea5d23bb5c7f85c07b10cc51740a7bd (patch) | |
tree | 6fd71def4c063a85e66526c1ce57f4794178814c /drivers/staging/winbond/wblinux_f.h | |
parent | 7f377f86fc678a411131844440483dbc64e11bc9 (diff) |
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_f.h')
-rw-r--r-- | drivers/staging/winbond/wblinux_f.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/winbond/wblinux_f.h b/drivers/staging/winbond/wblinux_f.h index ed2676b22f6b..4b786fcf34ec 100644 --- a/drivers/staging/winbond/wblinux_f.h +++ b/drivers/staging/winbond/wblinux_f.h @@ -1,7 +1,7 @@ #ifndef __WBLINUX_F_H #define __WBLINUX_F_H -#include "adapter.h" +#include "core.h" #include "mds_s.h" //========================================================================= @@ -9,14 +9,14 @@ // // wblinux_f.h // -unsigned char WBLINUX_Initial( struct wb35_adapter *adapter ); +unsigned char WBLINUX_Initial( struct wbsoft_priv *adapter ); int wb35_start_xmit(struct sk_buff *skb, struct net_device *netdev ); -void WBLINUX_stop( struct wb35_adapter *adapter ); -void WBLINUX_Destroy( struct wb35_adapter *adapter ); +void WBLINUX_stop( struct wbsoft_priv *adapter ); +void WBLINUX_Destroy( struct wbsoft_priv *adapter ); void wb35_set_multicast( struct net_device *netdev ); struct net_device_stats * wb35_netdev_stats( struct net_device *netdev ); -void WBLINUX_stop( struct wb35_adapter *adapter ); -void WbWlanHalt( struct wb35_adapter *adapter ); -unsigned char WbWLanInitialize(struct wb35_adapter *adapter); +void WBLINUX_stop( struct wbsoft_priv *adapter ); +void WbWlanHalt( struct wbsoft_priv *adapter ); +unsigned char WbWLanInitialize(struct wbsoft_priv *adapter); #endif |