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/core.h | |
| parent | ac418b8faaaad7a17474c8fba5c2e5917c91cf31 (diff) | |
| download | linux-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/core.h')
| -rw-r--r-- | drivers/staging/winbond/core.h | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h index 62ad954..64b73bb 100644 --- a/drivers/staging/winbond/core.h +++ b/drivers/staging/winbond/core.h @@ -1,10 +1,44 @@ #ifndef __WINBOND_CORE_H #define __WINBOND_CORE_H -#include "adapter.h" +#include <linux/wireless.h> + +#include "bssdscpt.h" +#include "mto.h" +#include "wbhal_s.h" + +#define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4) + +#define WB_MAX_LINK_NAME_LEN 40 struct wbsoft_priv { - struct wb35_adapter *adapter; + u32 adapterIndex; // 20060703.4 Add for using padapterContext global adapter point + + WB_LOCALDESCRIPT sLocalPara; // Myself connected parameters + PWB_BSSDESCRIPTION asBSSDescriptElement; + + MLME_FRAME sMlmeFrame; // connect to peerSTA parameters + + MTO_PARAMETERS sMtoPara; // MTO_struct ... + hw_data_t sHwData; //For HAL + MDS Mds; + + spinlock_t SpinLock; + u32 shutdown; + + atomic_t ThreadCount; + + u32 RxByteCount; + u32 TxByteCount; + + struct sk_buff *skb_array[WBLINUX_PACKET_ARRAY_SIZE]; + struct sk_buff *packet_return; + s32 skb_SetIndex; + s32 skb_GetIndex; + s32 netif_state_stop; // 1: stop 0: normal + struct iw_statistics iw_stats; + + u8 LinkName[WB_MAX_LINK_NAME_LEN]; }; #endif /* __WINBOND_CORE_H */ |