mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-08 14:33:05 +00:00
rtl8188eu: Remove most typedef statements from include/osdep_service.h
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
parent
26b163f24f
commit
e2285839e9
46 changed files with 531 additions and 733 deletions
|
|
@ -29,7 +29,7 @@ extern sint _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv);
|
|||
extern sint _rtw_init_evt_priv(struct evt_priv *pevtpriv);
|
||||
extern void _rtw_free_evt_priv (struct evt_priv *pevtpriv);
|
||||
extern void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv);
|
||||
extern sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj);
|
||||
extern struct cmd_obj *_rtw_dequeue_cmd(_queue *queue);
|
||||
extern sint _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj);
|
||||
extern struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ struct dvobj_priv {
|
|||
|
||||
int RegUsbSS;
|
||||
|
||||
_sema usb_suspend_sema;
|
||||
struct semaphore usb_suspend_sema;
|
||||
|
||||
_mutex usb_vendor_req_mutex;
|
||||
|
||||
|
|
@ -296,8 +296,8 @@ struct proxim {
|
|||
#ifdef CONFIG_MAC_LOOPBACK_DRIVER
|
||||
typedef struct loopbackdata
|
||||
{
|
||||
_sema sema;
|
||||
_thread_hdl_ lbkthread;
|
||||
struct semaphore sema;
|
||||
void * lbkthread;
|
||||
u8 bstop;
|
||||
u32 cnt;
|
||||
u16 size;
|
||||
|
|
@ -329,7 +329,7 @@ struct adapter {
|
|||
struct recv_priv recvpriv;
|
||||
struct sta_priv stapriv;
|
||||
struct security_priv securitypriv;
|
||||
_lock security_key_mutex; // add for CONFIG_IEEE80211W, none 11w also can use
|
||||
spinlock_t security_key_mutex; // add for CONFIG_IEEE80211W, none 11w also can use
|
||||
struct registry_priv registrypriv;
|
||||
struct eeprom_priv eeprompriv;
|
||||
struct led_priv ledpriv;
|
||||
|
|
@ -373,19 +373,19 @@ struct adapter {
|
|||
u8 init_adpt_in_progress;
|
||||
u8 bHaltInProgress;
|
||||
|
||||
_thread_hdl_ cmdThread;
|
||||
_thread_hdl_ evtThread;
|
||||
_thread_hdl_ xmitThread;
|
||||
_thread_hdl_ recvThread;
|
||||
void * cmdThread;
|
||||
void * evtThread;
|
||||
void * xmitThread;
|
||||
void * recvThread;
|
||||
|
||||
void (*intf_start)(struct adapter * adapter);
|
||||
void (*intf_stop)(struct adapter * adapter);
|
||||
|
||||
_nic_hdl pnetdev;
|
||||
struct net_device * pnetdev;
|
||||
|
||||
// used by rtw_rereg_nd_name related function
|
||||
struct rereg_nd_name_data {
|
||||
_nic_hdl old_pnetdev;
|
||||
struct net_device * old_pnetdev;
|
||||
char old_ifname[IFNAMSIZ];
|
||||
u8 old_ips_mode;
|
||||
u8 old_bRegUseLed;
|
||||
|
|
@ -426,7 +426,7 @@ struct adapter {
|
|||
u8 iface_id;
|
||||
|
||||
#ifdef CONFIG_BR_EXT
|
||||
_lock br_ext_lock;
|
||||
spinlock_t br_ext_lock;
|
||||
//unsigned int macclone_completed;
|
||||
struct nat25_network_db_entry *nethash[NAT25_HASH_SIZE];
|
||||
int pppoe_connection_in_progress;
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ struct hal_ops {
|
|||
void (*write_rfreg)(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data);
|
||||
|
||||
#ifdef CONFIG_HOSTAPD_MLME
|
||||
s32 (*hostap_mgnt_xmit_entry)(struct adapter *padapter, _pkt *pkt);
|
||||
s32 (*hostap_mgnt_xmit_entry)(struct adapter *padapter, struct sk_buff *pkt);
|
||||
#endif
|
||||
|
||||
void (*EfusePowerSwitch)(struct adapter *padapter, u8 bWrite, u8 PwrState);
|
||||
|
|
@ -399,7 +399,7 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *padapter);
|
|||
void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src);
|
||||
|
||||
#ifdef CONFIG_HOSTAPD_MLME
|
||||
s32 rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt);
|
||||
s32 rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, struct sk_buff *pkt);
|
||||
#endif
|
||||
|
||||
void rtw_hal_sreset_init(struct adapter *padapter);
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@ struct ieee_ibss_seq {
|
|||
u16 seq_num;
|
||||
u16 frag_num;
|
||||
unsigned long packet_time;
|
||||
_list list;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
struct rtw_ieee80211_hdr {
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ struct rtw_wdev_priv
|
|||
struct adapter *padapter;
|
||||
|
||||
struct cfg80211_scan_request *scan_request;
|
||||
_lock scan_req_lock;
|
||||
spinlock_t scan_req_lock;
|
||||
|
||||
struct net_device *pmon_ndev;//for monitor interface
|
||||
char ifname_mon[IFNAMSIZ + 1]; //interface name for monitor interface
|
||||
|
|
|
|||
|
|
@ -53,11 +53,11 @@ The protection mechanism is through the pending queue.
|
|||
|
||||
// when in USB, IO is through interrupt in/out endpoints
|
||||
struct usb_device *udev;
|
||||
PURB piorw_urb;
|
||||
struct urb *piorw_urb;
|
||||
u8 io_irp_cnt;
|
||||
u8 bio_irp_pending;
|
||||
_sema io_retevt;
|
||||
_timer io_timer;
|
||||
struct semaphore io_retevt;
|
||||
struct timer_list io_timer;
|
||||
u8 bio_irp_timeout;
|
||||
u8 bio_timer_cancel;
|
||||
};
|
||||
|
|
@ -102,7 +102,7 @@ int rtw_ips_pwr_up(struct adapter *padapter);
|
|||
void rtw_ips_pwr_down(struct adapter *padapter);
|
||||
|
||||
int rtw_drv_register_netdev(struct adapter *padapter);
|
||||
void rtw_ndev_destructor(_nic_hdl ndev);
|
||||
void rtw_ndev_destructor(struct net_device * ndev);
|
||||
|
||||
int rtw_suspend_common(struct adapter *padapter);
|
||||
int rtw_resume_common(struct adapter *padapter);
|
||||
|
|
|
|||
|
|
@ -96,47 +96,24 @@ struct dvobj_priv;
|
|||
void rtw_unregister_netdevs(struct dvobj_priv *dvobj);
|
||||
int pm_netdev_open(struct net_device *pnetdev,u8 bnormal);
|
||||
|
||||
typedef struct urb * PURB;
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,22))
|
||||
#ifdef CONFIG_USB_SUSPEND
|
||||
#define CONFIG_AUTOSUSPEND 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
typedef struct semaphore _sema;
|
||||
typedef spinlock_t _lock;
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
|
||||
typedef struct mutex _mutex;
|
||||
#else
|
||||
typedef struct semaphore _mutex;
|
||||
#endif
|
||||
typedef struct timer_list _timer;
|
||||
|
||||
struct __queue {
|
||||
struct list_head queue;
|
||||
_lock lock;
|
||||
spinlock_t lock;
|
||||
};
|
||||
|
||||
typedef struct sk_buff _pkt;
|
||||
typedef unsigned char _buffer;
|
||||
|
||||
typedef struct __queue _queue;
|
||||
typedef struct list_head _list;
|
||||
typedef int _OS_STATUS;
|
||||
//typedef u32 _irqL;
|
||||
typedef unsigned long _irqL;
|
||||
typedef struct net_device * _nic_hdl;
|
||||
|
||||
typedef void* _thread_hdl_;
|
||||
typedef int thread_return;
|
||||
typedef void* thread_context;
|
||||
|
||||
#define thread_exit() complete_and_exit(NULL, 0)
|
||||
|
||||
typedef void timer_hdl_return;
|
||||
typedef void* timer_hdl_context;
|
||||
typedef struct work_struct _workitem;
|
||||
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
|
||||
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
|
||||
#endif
|
||||
|
|
@ -164,12 +141,12 @@ static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
|
|||
}
|
||||
#endif
|
||||
|
||||
__inline static _list *get_next(_list *list)
|
||||
__inline static struct list_head *get_next(struct list_head *list)
|
||||
{
|
||||
return list->next;
|
||||
}
|
||||
|
||||
__inline static _list *get_list_head(_queue *queue)
|
||||
__inline static struct list_head *get_list_head(struct __queue *queue)
|
||||
{
|
||||
return (&(queue->queue));
|
||||
}
|
||||
|
|
@ -179,31 +156,30 @@ __inline static _list *get_list_head(_queue *queue)
|
|||
((type *)((char *)(ptr)-(SIZE_T)(&((type *)0)->member)))
|
||||
|
||||
|
||||
__inline static void _enter_critical(_lock *plock, _irqL *pirqL)
|
||||
__inline static void _enter_critical(spinlock_t *plock, unsigned long *pirqL)
|
||||
{
|
||||
spin_lock_irqsave(plock, *pirqL);
|
||||
}
|
||||
|
||||
__inline static void _exit_critical(_lock *plock, _irqL *pirqL)
|
||||
__inline static void _exit_critical(spinlock_t *plock, unsigned long *pirqL)
|
||||
{
|
||||
spin_unlock_irqrestore(plock, *pirqL);
|
||||
}
|
||||
|
||||
__inline static void _enter_critical_ex(_lock *plock, _irqL *pirqL)
|
||||
__inline static void _enter_critical_ex(spinlock_t *plock, unsigned long *pirqL)
|
||||
{
|
||||
spin_lock_irqsave(plock, *pirqL);
|
||||
}
|
||||
|
||||
__inline static void _exit_critical_ex(_lock *plock, _irqL *pirqL)
|
||||
__inline static void _exit_critical_ex(spinlock_t *plock, unsigned long *pirqL)
|
||||
{
|
||||
spin_unlock_irqrestore(plock, *pirqL);
|
||||
}
|
||||
|
||||
__inline static int _enter_critical_mutex(_mutex *pmutex, _irqL *pirqL)
|
||||
__inline static int _enter_critical_mutex(_mutex *pmutex, unsigned long *pirqL)
|
||||
{
|
||||
int ret = 0;
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
|
||||
//mutex_lock(pmutex);
|
||||
ret = mutex_lock_interruptible(pmutex);
|
||||
#else
|
||||
ret = down_interruptible(pmutex);
|
||||
|
|
@ -212,7 +188,7 @@ __inline static int _enter_critical_mutex(_mutex *pmutex, _irqL *pirqL)
|
|||
}
|
||||
|
||||
|
||||
__inline static void _exit_critical_mutex(_mutex *pmutex, _irqL *pirqL)
|
||||
__inline static void _exit_critical_mutex(_mutex *pmutex, unsigned long *pirqL)
|
||||
{
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
|
||||
mutex_unlock(pmutex);
|
||||
|
|
@ -221,25 +197,24 @@ __inline static void _exit_critical_mutex(_mutex *pmutex, _irqL *pirqL)
|
|||
#endif
|
||||
}
|
||||
|
||||
__inline static void rtw_list_delete(_list *plist)
|
||||
__inline static void rtw_list_delete(struct list_head *plist)
|
||||
{
|
||||
list_del_init(plist);
|
||||
}
|
||||
|
||||
__inline static void _init_timer(_timer *ptimer,_nic_hdl nic_hdl,void *pfunc,void* cntx)
|
||||
__inline static void _init_timer(struct timer_list *ptimer,struct net_device * nic_hdl,void *pfunc,void* cntx)
|
||||
{
|
||||
//setup_timer(ptimer, pfunc,(u32)cntx);
|
||||
ptimer->function = pfunc;
|
||||
ptimer->data = (unsigned long)cntx;
|
||||
init_timer(ptimer);
|
||||
}
|
||||
|
||||
__inline static void _set_timer(_timer *ptimer,u32 delay_time)
|
||||
__inline static void _set_timer(struct timer_list *ptimer,u32 delay_time)
|
||||
{
|
||||
mod_timer(ptimer , (jiffies+(delay_time*HZ/1000)));
|
||||
}
|
||||
|
||||
__inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled)
|
||||
__inline static void _cancel_timer(struct timer_list *ptimer,u8 *bcancelled)
|
||||
{
|
||||
del_timer_sync(ptimer);
|
||||
*bcancelled= true;//true ==1; false==0
|
||||
|
|
@ -251,7 +226,7 @@ __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled)
|
|||
#define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS)
|
||||
|
||||
|
||||
__inline static void _init_workitem(_workitem *pwork, void *pfunc, void * cntx)
|
||||
__inline static void _init_workitem(struct work_struct *pwork, void *pfunc, void * cntx)
|
||||
{
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
|
||||
INIT_WORK(pwork, pfunc);
|
||||
|
|
@ -260,12 +235,12 @@ __inline static void _init_workitem(_workitem *pwork, void *pfunc, void * cntx)
|
|||
#endif
|
||||
}
|
||||
|
||||
__inline static void _set_workitem(_workitem *pwork)
|
||||
__inline static void _set_workitem(struct work_struct *pwork)
|
||||
{
|
||||
schedule_work(pwork);
|
||||
}
|
||||
|
||||
__inline static void _cancel_workitem_sync(_workitem *pwork)
|
||||
__inline static void _cancel_workitem_sync(struct work_struct *pwork)
|
||||
{
|
||||
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,22))
|
||||
cancel_work_sync(pwork);
|
||||
|
|
@ -398,11 +373,11 @@ enum mstat_f {
|
|||
#define mstat_tf_idx(flags) ((flags)&0xff)
|
||||
#define mstat_ff_idx(flags) (((flags)&0xff00) >> 8)
|
||||
|
||||
typedef enum mstat_status{
|
||||
enum mstat_status {
|
||||
MSTAT_ALLOC_SUCCESS = 0,
|
||||
MSTAT_ALLOC_FAIL,
|
||||
MSTAT_FREE
|
||||
} MSTAT_STATUS;
|
||||
};
|
||||
|
||||
#ifdef DBG_MEM_ALLOC
|
||||
void rtw_mstat_update(const enum mstat_f flags, const MSTAT_STATUS status, u32 sz);
|
||||
|
|
@ -419,7 +394,7 @@ struct sk_buff * dbg_rtw_skb_alloc(unsigned int size, const enum mstat_f flags,
|
|||
void dbg_rtw_skb_free(struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line);
|
||||
struct sk_buff *dbg_rtw_skb_copy(const struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line);
|
||||
struct sk_buff *dbg_rtw_skb_clone(struct sk_buff *skb, const enum mstat_f flags, const char *func, const int line);
|
||||
int dbg_rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line);
|
||||
int dbg_rtw_netif_rx(struct net_device * ndev, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line);
|
||||
void dbg_rtw_skb_queue_purge(struct sk_buff_head *list, enum mstat_f flags, const char *func, int line);
|
||||
|
||||
void *dbg_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr_t *dma, const enum mstat_f flags, const char *func, const int line);
|
||||
|
|
@ -476,7 +451,7 @@ struct sk_buff *_rtw_skb_alloc(u32 sz);
|
|||
void _rtw_skb_free(struct sk_buff *skb);
|
||||
struct sk_buff *_rtw_skb_copy(const struct sk_buff *skb);
|
||||
struct sk_buff *_rtw_skb_clone(struct sk_buff *skb);
|
||||
int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb);
|
||||
int _rtw_netif_rx(struct net_device * ndev, struct sk_buff *skb);
|
||||
void _rtw_skb_queue_purge(struct sk_buff_head *list);
|
||||
|
||||
void *_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr_t *dma);
|
||||
|
|
@ -520,23 +495,23 @@ void _rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_a
|
|||
#define rtw_usb_buffer_free_f(dev, size, addr, dma, mstat_f) _rtw_usb_buffer_free((dev), (size), (addr), (dma))
|
||||
#endif /* DBG_MEM_ALLOC */
|
||||
|
||||
static inline void _rtw_spinlock(_lock *plock)
|
||||
static inline void _rtw_spinlock(spinlock_t *plock)
|
||||
{
|
||||
spin_lock(plock);
|
||||
}
|
||||
|
||||
static inline void _rtw_spinunlock(_lock *plock)
|
||||
static inline void _rtw_spinunlock(spinlock_t *plock)
|
||||
{
|
||||
spin_unlock(plock);
|
||||
}
|
||||
|
||||
|
||||
static inline void _rtw_spinlock_ex(_lock *plock)
|
||||
static inline void _rtw_spinlock_ex(spinlock_t *plock)
|
||||
{
|
||||
spin_lock(plock);
|
||||
}
|
||||
|
||||
static inline void _rtw_spinunlock_ex(_lock *plock)
|
||||
static inline void _rtw_spinunlock_ex(spinlock_t *plock)
|
||||
{
|
||||
spin_unlock(plock);
|
||||
}
|
||||
|
|
@ -546,22 +521,22 @@ void rtw_mfree2d(void *pbuf, int h, int w, int size);
|
|||
|
||||
int _rtw_memcmp(void *dst, void *src, u32 sz);
|
||||
|
||||
void _rtw_init_listhead(_list *list);
|
||||
u32 rtw_is_list_empty(_list *phead);
|
||||
void rtw_list_insert_head(_list *plist, _list *phead);
|
||||
void rtw_list_insert_tail(_list *plist, _list *phead);
|
||||
void rtw_list_delete(_list *plist);
|
||||
void _rtw_init_listhead(struct list_head *list);
|
||||
u32 rtw_is_list_empty(struct list_head *phead);
|
||||
void rtw_list_insert_head(struct list_head *plist, struct list_head *phead);
|
||||
void rtw_list_insert_tail(struct list_head *plist, struct list_head *phead);
|
||||
void rtw_list_delete(struct list_head *plist);
|
||||
|
||||
void _rtw_init_sema(_sema *sema, int init_val);
|
||||
void _rtw_free_sema(_sema *sema);
|
||||
void _rtw_up_sema(_sema *sema);
|
||||
u32 _rtw_down_sema(_sema *sema);
|
||||
void _rtw_init_sema(struct semaphore *sema, int init_val);
|
||||
void _rtw_free_sema(struct semaphore *sema);
|
||||
void _rtw_up_sema(struct semaphore *sema);
|
||||
u32 _rtw_down_sema(struct semaphore *sema);
|
||||
void _rtw_mutex_init(_mutex *pmutex);
|
||||
void _rtw_mutex_free(_mutex *pmutex);
|
||||
|
||||
void _rtw_init_queue(_queue *pqueue);
|
||||
u32 _rtw_queue_empty(_queue *pqueue);
|
||||
u32 rtw_end_of_queue_search(_list *queue, _list *pelement);
|
||||
void _rtw_init_queue(struct __queue *pqueue);
|
||||
u32 _rtw_queue_empty(struct __queue *pqueue);
|
||||
u32 rtw_end_of_queue_search(struct list_head *queue, struct list_head *pelement);
|
||||
|
||||
u32 rtw_get_current_time(void);
|
||||
u32 rtw_systime_to_ms(u32 systime);
|
||||
|
|
@ -589,7 +564,7 @@ void rtw_udelay_os(int us);
|
|||
void rtw_yield_os(void);
|
||||
|
||||
|
||||
__inline static unsigned char _cancel_timer_ex(_timer *ptimer)
|
||||
__inline static unsigned char _cancel_timer_ex(struct timer_list *ptimer)
|
||||
{
|
||||
return del_timer_sync(ptimer);
|
||||
}
|
||||
|
|
@ -610,11 +585,6 @@ __inline static void flush_signals_thread(void)
|
|||
}
|
||||
}
|
||||
|
||||
__inline static _OS_STATUS res_to_status(sint res)
|
||||
{
|
||||
return res;
|
||||
}
|
||||
|
||||
__inline static void rtw_dump_stack(void)
|
||||
{
|
||||
dump_stack();
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ void _rtw_free_recv_priv (struct recv_priv *precvpriv);
|
|||
|
||||
s32 rtw_recv_entry(union recv_frame *precv_frame);
|
||||
int rtw_recv_indicatepkt(struct adapter *adapter, union recv_frame *precv_frame);
|
||||
void rtw_recv_returnpacket(_nic_hdl cnxt, _pkt *preturnedpkt);
|
||||
void rtw_recv_returnpacket(struct net_device * cnxt, struct sk_buff *preturnedpkt);
|
||||
|
||||
void rtw_hostapd_mlme_rx(struct adapter *padapter, union recv_frame *precv_frame);
|
||||
void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup);
|
||||
|
|
|
|||
|
|
@ -396,7 +396,6 @@ typedef struct hal_data_8188e
|
|||
|
||||
struct dm_priv dmpriv;
|
||||
DM_ODM_T odmpriv;
|
||||
//_lock odm_stainfo_lock;
|
||||
struct sreset_priv srestpriv;
|
||||
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
|
|
|
|||
|
|
@ -47,15 +47,13 @@
|
|||
u32 cmdsz;
|
||||
u8 *rsp;
|
||||
u32 rspsz;
|
||||
//_sema cmd_sem;
|
||||
_list list;
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
struct cmd_priv {
|
||||
_sema cmd_queue_sema;
|
||||
//_sema cmd_done_sema;
|
||||
_sema terminate_cmdthread_sema;
|
||||
_queue cmd_queue;
|
||||
struct semaphore cmd_queue_sema;
|
||||
struct semaphore terminate_cmdthread_sema;
|
||||
struct __queue cmd_queue;
|
||||
u8 cmd_seq;
|
||||
u8 *cmd_buf; //shall be non-paged, and 4 bytes aligned
|
||||
u8 *cmd_allocated_buf;
|
||||
|
|
@ -72,14 +70,14 @@
|
|||
struct evt_priv {
|
||||
#define CONFIG_C2H_WK
|
||||
#ifdef CONFIG_C2H_WK
|
||||
_workitem c2h_wk;
|
||||
struct work_struct c2h_wk;
|
||||
bool c2h_wk_alive;
|
||||
struct rtw_cbuf *c2h_queue;
|
||||
#define C2H_QUEUE_MAX_LEN 10
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_H2CLBK
|
||||
_sema lbkevt_done;
|
||||
struct semaphore lbkevt_done;
|
||||
u8 lbkevt_limit;
|
||||
u8 lbkevt_num;
|
||||
u8 *cmdevt_parm;
|
||||
|
|
@ -114,7 +112,7 @@ struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv);
|
|||
void rtw_free_cmd_obj(struct cmd_obj *pcmd);
|
||||
|
||||
void rtw_stop_cmd_thread(struct adapter *adapter);
|
||||
thread_return rtw_cmd_thread(thread_context context);
|
||||
int rtw_cmd_thread(void * context);
|
||||
|
||||
u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv);
|
||||
void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <linux/semaphore.h>
|
||||
#endif
|
||||
#include <linux/list.h>
|
||||
//#include <linux/smp_lock.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <asm/atomic.h>
|
||||
|
||||
|
|
@ -144,13 +143,13 @@ struct _io_ops
|
|||
};
|
||||
|
||||
struct io_req {
|
||||
_list list;
|
||||
struct list_head list;
|
||||
u32 addr;
|
||||
volatile u32 val;
|
||||
u32 command;
|
||||
u32 status;
|
||||
u8 *pbuf;
|
||||
_sema sema;
|
||||
struct semaphore sema;
|
||||
|
||||
void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt);
|
||||
u8 *cnxt;
|
||||
|
|
@ -287,10 +286,10 @@ Below is the data structure used by _io_handler
|
|||
*/
|
||||
|
||||
struct io_queue {
|
||||
_lock lock;
|
||||
_list free_ioreqs;
|
||||
_list pending; //The io_req list that will be served in the single protocol read/write.
|
||||
_list processing;
|
||||
spinlock_t lock;
|
||||
struct list_head free_ioreqs;
|
||||
struct list_head pending; //The io_req list that will be served in the single protocol read/write.
|
||||
struct list_head processing;
|
||||
u8 *free_ioreqs_buf; // 4-byte aligned
|
||||
u8 *pallocated_free_ioreqs_buf;
|
||||
struct intf_hdl intf;
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ extern struct iw_handler_def rtw_handlers_def;
|
|||
#endif
|
||||
|
||||
extern NDIS_STATUS drv_query_info(
|
||||
_nic_hdl MiniportAdapterContext,
|
||||
struct net_device * MiniportAdapterContext,
|
||||
NDIS_OID Oid,
|
||||
void * InformationBuffer,
|
||||
u32 InformationBufferLength,
|
||||
|
|
@ -117,7 +117,7 @@ extern NDIS_STATUS drv_query_info(
|
|||
);
|
||||
|
||||
extern NDIS_STATUS drv_set_info(
|
||||
_nic_hdl MiniportAdapterContext,
|
||||
struct net_device * MiniportAdapterContext,
|
||||
NDIS_OID Oid,
|
||||
void * InformationBuffer,
|
||||
u32 InformationBufferLength,
|
||||
|
|
|
|||
|
|
@ -109,26 +109,26 @@ typedef struct _LED_871x{
|
|||
LED_STATE_871x CurrLedState; // Current LED state.
|
||||
LED_STATE_871x BlinkingLedState; // Next state for blinking, either RTW_LED_ON or RTW_LED_OFF are.
|
||||
|
||||
u8 bLedOn; // true if LED is ON, false if LED is OFF.
|
||||
u8 bLedOn; // true if LED is ON, false if LED is OFF.
|
||||
|
||||
u8 bLedBlinkInProgress; // true if it is blinking, false o.w..
|
||||
u8 bLedBlinkInProgress; // true if it is blinking, false o.w..
|
||||
|
||||
u8 bLedWPSBlinkInProgress;
|
||||
u8 bLedWPSBlinkInProgress;
|
||||
|
||||
u32 BlinkTimes; // Number of times to toggle led state for blinking.
|
||||
u32 BlinkTimes; // Number of times to toggle led state for blinking.
|
||||
|
||||
_timer BlinkTimer; // Timer object for led blinking.
|
||||
struct timer_list BlinkTimer; // Timer object for led blinking.
|
||||
|
||||
u8 bSWLedCtrl;
|
||||
u8 bSWLedCtrl;
|
||||
|
||||
// ALPHA, added by chiyoko, 20090106
|
||||
u8 bLedNoLinkBlinkInProgress;
|
||||
u8 bLedLinkBlinkInProgress;
|
||||
u8 bLedStartToLinkBlinkInProgress;
|
||||
u8 bLedScanBlinkInProgress;
|
||||
u8 bLedNoLinkBlinkInProgress;
|
||||
u8 bLedLinkBlinkInProgress;
|
||||
u8 bLedStartToLinkBlinkInProgress;
|
||||
u8 bLedScanBlinkInProgress;
|
||||
|
||||
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
|
||||
_workitem BlinkWorkItem; // Workitem used by BlinkTimer to manipulate H/W to blink LED.
|
||||
struct work_struct BlinkWorkItem; // Workitem used by BlinkTimer to manipulate H/W to blink LED.
|
||||
#endif
|
||||
} LED_871x, *PLED_871x;
|
||||
|
||||
|
|
@ -166,7 +166,7 @@ struct led_priv{
|
|||
LED_871x SwLed0;
|
||||
LED_871x SwLed1;
|
||||
LED_STRATEGY_871x LedStrategy;
|
||||
u8 bRegUseLed;
|
||||
u8 bRegUseLed;
|
||||
void (*LedControlHandler)(struct adapter *padapter, LED_CTL_MODE LedAction);
|
||||
/* add for led controll */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ struct sitesurvey_ctrl {
|
|||
u64 last_tx_pkts;
|
||||
uint last_rx_pkts;
|
||||
sint traffic_busy;
|
||||
_timer sitesurvey_ctrl_timer;
|
||||
struct timer_list sitesurvey_ctrl_timer;
|
||||
};
|
||||
|
||||
typedef struct _RT_LINK_DETECT_T{
|
||||
|
|
@ -249,7 +249,7 @@ struct scan_limit_info{
|
|||
};
|
||||
|
||||
struct cfg80211_wifidirect_info{
|
||||
_timer remain_on_ch_timer;
|
||||
struct timer_list remain_on_ch_timer;
|
||||
u8 restore_channel;
|
||||
struct ieee80211_channel remain_on_ch_channel;
|
||||
enum nl80211_channel_type remain_on_ch_type;
|
||||
|
|
@ -259,13 +259,13 @@ struct cfg80211_wifidirect_info{
|
|||
|
||||
struct wifidirect_info{
|
||||
struct adapter* padapter;
|
||||
_timer find_phase_timer;
|
||||
_timer restore_p2p_state_timer;
|
||||
struct timer_list find_phase_timer;
|
||||
struct timer_list restore_p2p_state_timer;
|
||||
|
||||
// Used to do the scanning. After confirming the peer is availalble, the driver transmits the P2P frame to peer.
|
||||
_timer pre_tx_scan_timer;
|
||||
_timer reset_ch_sitesurvey;
|
||||
_timer reset_ch_sitesurvey2; // Just for resetting the scan limit function by using p2p nego
|
||||
struct timer_list pre_tx_scan_timer;
|
||||
struct timer_list reset_ch_sitesurvey;
|
||||
struct timer_list reset_ch_sitesurvey2; // Just for resetting the scan limit function by using p2p nego
|
||||
struct tx_provdisc_req_info tx_prov_disc_info;
|
||||
struct rx_provdisc_req_info rx_prov_disc_info;
|
||||
struct tx_invite_req_info invitereq_info;
|
||||
|
|
@ -359,17 +359,17 @@ struct tdls_info{
|
|||
u8 sta_cnt;
|
||||
u8 sta_maximum; // 1:tdls sta is equal (NUM_STA-1), reach max direct link number; 0: else;
|
||||
struct tdls_ss_record ss_record;
|
||||
u8 macid_index; //macid entry that is ready to write
|
||||
u8 clear_cam; //cam entry that is trying to clear, using it in direct link teardown
|
||||
u8 ch_sensing;
|
||||
u8 cur_channel;
|
||||
u8 candidate_ch;
|
||||
u8 collect_pkt_num[MAX_CHANNEL_NUM];
|
||||
_lock cmd_lock;
|
||||
_lock hdl_lock;
|
||||
u8 watchdog_count;
|
||||
u8 dev_discovered; //WFD_TDLS: for sigma test
|
||||
u8 enable;
|
||||
u8 macid_index; //macid entry that is ready to write
|
||||
u8 clear_cam; //cam entry that is trying to clear, using it in direct link teardown
|
||||
u8 ch_sensing;
|
||||
u8 cur_channel;
|
||||
u8 candidate_ch;
|
||||
u8 collect_pkt_num[MAX_CHANNEL_NUM];
|
||||
spinlock_t cmd_lock;
|
||||
spinlock_t hdl_lock;
|
||||
u8 watchdog_count;
|
||||
u8 dev_discovered; //WFD_TDLS: for sigma test
|
||||
u8 enable;
|
||||
#ifdef CONFIG_P2P
|
||||
struct wifi_display_info *wfd_info;
|
||||
#endif
|
||||
|
|
@ -377,7 +377,7 @@ struct tdls_info{
|
|||
|
||||
struct mlme_priv {
|
||||
|
||||
_lock lock;
|
||||
spinlock_t lock;
|
||||
sint fw_state; //shall we protect this variable? maybe not necessarily...
|
||||
u8 bScanInProcess;
|
||||
u8 to_join; //flag
|
||||
|
|
@ -386,9 +386,9 @@ struct mlme_priv {
|
|||
u8 *nic_hdl;
|
||||
|
||||
u8 not_indic_disco;
|
||||
_list *pscanned;
|
||||
_queue free_bss_pool;
|
||||
_queue scanned_queue;
|
||||
struct list_head *pscanned;
|
||||
struct __queue free_bss_pool;
|
||||
struct __queue scanned_queue;
|
||||
u8 *free_bss_buf;
|
||||
u32 num_of_scanned;
|
||||
|
||||
|
|
@ -407,15 +407,15 @@ struct mlme_priv {
|
|||
|
||||
u32 scan_interval;
|
||||
|
||||
_timer assoc_timer;
|
||||
struct timer_list assoc_timer;
|
||||
|
||||
uint assoc_by_bssid;
|
||||
uint assoc_by_rssi;
|
||||
|
||||
_timer scan_to_timer; // driver itself handles scan_timeout status.
|
||||
struct timer_list scan_to_timer; // driver itself handles scan_timeout status.
|
||||
u32 scan_start_time; // used to evaluate the time spent in scanning
|
||||
|
||||
_timer set_scan_deny_timer;
|
||||
struct timer_list set_scan_deny_timer;
|
||||
ATOMIC_T set_scan_deny; //0: allowed, 1: deny
|
||||
|
||||
struct qos_priv qospriv;
|
||||
|
|
@ -432,7 +432,7 @@ struct mlme_priv {
|
|||
struct ht_priv htpriv;
|
||||
|
||||
RT_LINK_DETECT_T LinkDetectInfo;
|
||||
_timer dynamic_chk_timer; //dynamic/periodic check timer
|
||||
struct timer_list dynamic_chk_timer; //dynamic/periodic check timer
|
||||
|
||||
u8 acm_mask; // for wmm acm mask
|
||||
u8 ChannelPlan;
|
||||
|
|
@ -495,7 +495,7 @@ struct mlme_priv {
|
|||
u32 p2p_probe_resp_ie_len;
|
||||
u32 p2p_go_probe_resp_ie_len; //for GO
|
||||
u32 p2p_assoc_req_ie_len;
|
||||
_lock bcn_update_lock;
|
||||
spinlock_t bcn_update_lock;
|
||||
u8 update_bcn;
|
||||
|
||||
|
||||
|
|
@ -608,8 +608,6 @@ __inline static void _clr_fwstate_(struct mlme_priv *pmlmepriv, sint state)
|
|||
*/
|
||||
__inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state)
|
||||
{
|
||||
_irqL irqL;
|
||||
|
||||
spin_lock_bh(&pmlmepriv->lock);
|
||||
if (check_fwstate(pmlmepriv, state) == true)
|
||||
pmlmepriv->fw_state ^= state;
|
||||
|
|
@ -618,8 +616,6 @@ __inline static void clr_fwstate(struct mlme_priv *pmlmepriv, sint state)
|
|||
|
||||
__inline static void clr_fwstate_ex(struct mlme_priv *pmlmepriv, sint state)
|
||||
{
|
||||
_irqL irqL;
|
||||
|
||||
spin_lock_bh(&pmlmepriv->lock);
|
||||
_clr_fwstate_(pmlmepriv, state);
|
||||
spin_unlock_bh(&pmlmepriv->lock);
|
||||
|
|
@ -627,8 +623,6 @@ __inline static void clr_fwstate_ex(struct mlme_priv *pmlmepriv, sint state)
|
|||
|
||||
__inline static void up_scanned_network(struct mlme_priv *pmlmepriv)
|
||||
{
|
||||
_irqL irqL;
|
||||
|
||||
spin_lock_bh(&pmlmepriv->lock);
|
||||
pmlmepriv->num_of_scanned++;
|
||||
spin_unlock_bh(&pmlmepriv->lock);
|
||||
|
|
@ -636,8 +630,6 @@ __inline static void up_scanned_network(struct mlme_priv *pmlmepriv)
|
|||
|
||||
__inline static void down_scanned_network(struct mlme_priv *pmlmepriv)
|
||||
{
|
||||
_irqL irqL;
|
||||
|
||||
spin_lock_bh(&pmlmepriv->lock);
|
||||
pmlmepriv->num_of_scanned--;
|
||||
spin_unlock_bh(&pmlmepriv->lock);
|
||||
|
|
@ -645,8 +637,6 @@ __inline static void down_scanned_network(struct mlme_priv *pmlmepriv)
|
|||
|
||||
__inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint val)
|
||||
{
|
||||
_irqL irqL;
|
||||
|
||||
spin_lock_bh(&pmlmepriv->lock);
|
||||
pmlmepriv->num_of_scanned = val;
|
||||
spin_unlock_bh(&pmlmepriv->lock);
|
||||
|
|
@ -656,8 +646,8 @@ extern u16 rtw_get_capability(struct wlan_bssid_ex *bss);
|
|||
extern void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target);
|
||||
extern void rtw_disconnect_hdl_under_linked(struct adapter* adapter, struct sta_info *psta, u8 free_assoc);
|
||||
extern void rtw_generate_random_ibss(u8 *pibss);
|
||||
extern struct wlan_network* rtw_find_network(_queue *scanned_queue, u8 *addr);
|
||||
extern struct wlan_network* rtw_get_oldest_wlan_network(_queue *scanned_queue);
|
||||
extern struct wlan_network* rtw_find_network(struct __queue *scanned_queue, u8 *addr);
|
||||
extern struct wlan_network* rtw_get_oldest_wlan_network(struct __queue *scanned_queue);
|
||||
|
||||
extern void rtw_free_assoc_resources(struct adapter* adapter, int lock_scanned_queue);
|
||||
extern void rtw_indicate_disconnect(struct adapter* adapter);
|
||||
|
|
@ -688,9 +678,9 @@ void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);
|
|||
|
||||
extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv);
|
||||
|
||||
extern int _rtw_enqueue_network(_queue *queue, struct wlan_network *pnetwork);
|
||||
extern int _rtw_enqueue_network(struct __queue *queue, struct wlan_network *pnetwork);
|
||||
|
||||
extern struct wlan_network* _rtw_dequeue_network(_queue *queue);
|
||||
extern struct wlan_network* _rtw_dequeue_network(struct __queue *queue);
|
||||
|
||||
extern struct wlan_network* _rtw_alloc_network(struct mlme_priv *pmlmepriv);
|
||||
|
||||
|
|
@ -699,7 +689,7 @@ extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *
|
|||
extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork);
|
||||
|
||||
|
||||
extern struct wlan_network* _rtw_find_network(_queue *scanned_queue, u8 *addr);
|
||||
extern struct wlan_network* _rtw_find_network(struct __queue *scanned_queue, u8 *addr);
|
||||
|
||||
extern void _rtw_free_network_queue(struct adapter* padapter, u8 isfreeall);
|
||||
|
||||
|
|
|
|||
|
|
@ -447,12 +447,11 @@ struct mlme_ext_priv
|
|||
struct ss_res sitesurvey_res;
|
||||
struct mlme_ext_info mlmext_info;//for sta/adhoc mode, including current scanning/connecting/connected related info.
|
||||
//for ap mode, network includes ap's cap_info
|
||||
_timer survey_timer;
|
||||
_timer link_timer;
|
||||
struct timer_list survey_timer;
|
||||
struct timer_list link_timer;
|
||||
#ifdef CONFIG_IEEE80211W
|
||||
_timer sa_query_timer;
|
||||
struct timer_list sa_query_timer;
|
||||
#endif //CONFIG_IEEE80211W
|
||||
//_timer ADDBA_timer;
|
||||
u16 chan_scan_time;
|
||||
|
||||
u8 scan_abort;
|
||||
|
|
@ -670,18 +669,14 @@ void addba_timer_hdl(struct sta_info *psta);
|
|||
#ifdef CONFIG_IEEE80211W
|
||||
void sa_query_timer_hdl(struct adapter *padapter);
|
||||
#endif //CONFIG_IEEE80211W
|
||||
//void reauth_timer_hdl(struct adapter *padapter);
|
||||
//void reassoc_timer_hdl(struct adapter *padapter);
|
||||
|
||||
#define set_survey_timer(mlmeext, ms) \
|
||||
do { \
|
||||
/*DBG_871X("%s set_survey_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms));*/ \
|
||||
_set_timer(&(mlmeext)->survey_timer, (ms)); \
|
||||
} while(0)
|
||||
|
||||
#define set_link_timer(mlmeext, ms) \
|
||||
do { \
|
||||
/*DBG_871X("%s set_link_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms));*/ \
|
||||
_set_timer(&(mlmeext)->link_timer, (ms)); \
|
||||
} while(0)
|
||||
#ifdef CONFIG_IEEE80211W
|
||||
|
|
|
|||
|
|
@ -105,11 +105,11 @@ typedef enum _ANTENNA_PATH{
|
|||
|
||||
struct mp_xmit_frame
|
||||
{
|
||||
_list list;
|
||||
struct list_head list;
|
||||
|
||||
struct pkt_attrib attrib;
|
||||
|
||||
_pkt *pkt;
|
||||
struct sk_buff *pkt;
|
||||
|
||||
int frame_tag;
|
||||
|
||||
|
|
@ -121,7 +121,7 @@ struct mp_xmit_frame
|
|||
u8 *mem_addr;
|
||||
u32 sz[8];
|
||||
|
||||
PURB pxmit_urb[8];
|
||||
struct urb * pxmit_urb[8];
|
||||
|
||||
u8 bpending[8];
|
||||
sint ac_tag[8];
|
||||
|
|
@ -152,7 +152,7 @@ struct mp_tx
|
|||
u8 *pallocated_buf;
|
||||
u8 *buf;
|
||||
u32 buf_size, write_size;
|
||||
_thread_hdl_ PktTxThread;
|
||||
void * PktTxThread;
|
||||
};
|
||||
|
||||
#include <Hal8188EPhyCfg.h>
|
||||
|
|
@ -174,8 +174,8 @@ typedef struct _MPT_CONTEXT
|
|||
// Indicate if the driver is unloading or unloaded.
|
||||
bool bMptDrvUnload;
|
||||
|
||||
_sema MPh2c_Sema;
|
||||
_timer MPh2c_timeout_timer;
|
||||
struct semaphore MPh2c_Sema;
|
||||
struct timer_list MPh2c_timeout_timer;
|
||||
// Event used to sync H2c for BT control
|
||||
|
||||
bool MptH2cRspEvent;
|
||||
|
|
@ -343,7 +343,7 @@ struct mp_priv {
|
|||
|
||||
u8 *pallocated_mp_xmitframe_buf;
|
||||
u8 *pmp_xmtframe_buf;
|
||||
_queue free_mp_xmitqueue;
|
||||
struct __queue free_mp_xmitqueue;
|
||||
u32 free_mp_xmitframe_cnt;
|
||||
MPT_CONTEXT MptCtx;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -76,27 +76,7 @@ typedef struct _DR_VARIABLE_STRUCT_ {
|
|||
|
||||
//int mp_start_joinbss(struct adapter *padapter, NDIS_802_11_SSID *pssid);
|
||||
|
||||
//void _irqlevel_changed_(_irqL *irqlevel, /*bool*/unsigned char bLower);
|
||||
#ifdef PLATFORM_OS_XP
|
||||
static void _irqlevel_changed_(_irqL *irqlevel, u8 bLower)
|
||||
{
|
||||
|
||||
if (bLower == LOWER) {
|
||||
*irqlevel = KeGetCurrentIrql();
|
||||
|
||||
if (*irqlevel > PASSIVE_LEVEL) {
|
||||
KeLowerIrql(PASSIVE_LEVEL);
|
||||
}
|
||||
} else {
|
||||
if (KeGetCurrentIrql() == PASSIVE_LEVEL) {
|
||||
KeRaiseIrql(DISPATCH_LEVEL, irqlevel);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
#else
|
||||
#define _irqlevel_changed_(a,b)
|
||||
#endif
|
||||
|
||||
//oid_rtl_seg_81_80_00
|
||||
NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv* poid_par_priv);
|
||||
|
|
|
|||
|
|
@ -110,28 +110,24 @@ struct reportpwrstate_parm {
|
|||
unsigned short rsvd;
|
||||
};
|
||||
|
||||
|
||||
typedef _sema _pwrlock;
|
||||
|
||||
|
||||
__inline static void _init_pwrlock(_pwrlock *plock)
|
||||
__inline static void _init_pwrlock(struct semaphore *plock)
|
||||
{
|
||||
_rtw_init_sema(plock, 1);
|
||||
}
|
||||
|
||||
__inline static void _free_pwrlock(_pwrlock *plock)
|
||||
__inline static void _free_pwrlock(struct semaphore *plock)
|
||||
{
|
||||
_rtw_free_sema(plock);
|
||||
}
|
||||
|
||||
|
||||
__inline static void _enter_pwrlock(_pwrlock *plock)
|
||||
__inline static void _enter_pwrlock(struct semaphore *plock)
|
||||
{
|
||||
_rtw_down_sema(plock);
|
||||
}
|
||||
|
||||
|
||||
__inline static void _exit_pwrlock(_pwrlock *plock)
|
||||
__inline static void _exit_pwrlock(struct semaphore *plock)
|
||||
{
|
||||
_rtw_up_sema(plock);
|
||||
}
|
||||
|
|
@ -184,7 +180,7 @@ enum { // for ips_mode
|
|||
|
||||
struct pwrctrl_priv
|
||||
{
|
||||
_pwrlock lock;
|
||||
struct semaphore lock;
|
||||
volatile u8 rpwm; // requested power state for fw
|
||||
volatile u8 cpwm; // fw current power state. updated when 1. read from HCPWM 2. driver lowers power level
|
||||
volatile u8 tog; // toggling
|
||||
|
|
@ -195,7 +191,7 @@ struct pwrctrl_priv
|
|||
u8 bcn_ant_mode;
|
||||
|
||||
u32 alives;
|
||||
_workitem cpwm_event;
|
||||
struct work_struct cpwm_event;
|
||||
u8 bpower_saving;
|
||||
|
||||
u8 b_hw_radio_off;
|
||||
|
|
@ -233,7 +229,7 @@ struct pwrctrl_priv
|
|||
u8 autopm_cnt;
|
||||
#endif
|
||||
u8 bSupportRemoteWakeup;
|
||||
_timer pwr_state_check_timer;
|
||||
struct timer_list pwr_state_check_timer;
|
||||
int pwr_state_check_interval;
|
||||
u8 pwr_state_check_cnts;
|
||||
|
||||
|
|
@ -274,7 +270,6 @@ struct pwrctrl_priv
|
|||
|
||||
#define _rtw_set_pwr_state_check_timer(pwrctl, ms) \
|
||||
do { \
|
||||
/*DBG_871X("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __FUNCTION__, (pwrctl), (ms));*/ \
|
||||
_set_timer(&(pwrctl)->pwr_state_check_timer, (ms)); \
|
||||
} while(0)
|
||||
|
||||
|
|
|
|||
|
|
@ -61,30 +61,12 @@ struct recv_reorder_ctrl
|
|||
u16 indicate_seq;//=wstart_b, init_value=0xffff
|
||||
u16 wend_b;
|
||||
u8 wsize_b;
|
||||
_queue pending_recvframe_queue;
|
||||
_timer reordering_ctrl_timer;
|
||||
struct __queue pending_recvframe_queue;
|
||||
struct timer_list reordering_ctrl_timer;
|
||||
};
|
||||
|
||||
struct stainfo_rxcache {
|
||||
u16 tid_rxseq[16];
|
||||
/*
|
||||
unsigned short tid0_rxseq;
|
||||
unsigned short tid1_rxseq;
|
||||
unsigned short tid2_rxseq;
|
||||
unsigned short tid3_rxseq;
|
||||
unsigned short tid4_rxseq;
|
||||
unsigned short tid5_rxseq;
|
||||
unsigned short tid6_rxseq;
|
||||
unsigned short tid7_rxseq;
|
||||
unsigned short tid8_rxseq;
|
||||
unsigned short tid9_rxseq;
|
||||
unsigned short tid10_rxseq;
|
||||
unsigned short tid11_rxseq;
|
||||
unsigned short tid12_rxseq;
|
||||
unsigned short tid13_rxseq;
|
||||
unsigned short tid14_rxseq;
|
||||
unsigned short tid15_rxseq;
|
||||
*/
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -196,13 +178,12 @@ accesser of recv_priv: rtw_recv_entry(dispatch / passive level); recv_thread(pas
|
|||
|
||||
using enter_critical section to protect
|
||||
*/
|
||||
struct recv_priv
|
||||
{
|
||||
_lock lock;
|
||||
struct recv_priv {
|
||||
spinlock_t lock;
|
||||
|
||||
_queue free_recv_queue;
|
||||
_queue recv_pending_queue;
|
||||
_queue uc_swdec_pending_queue;
|
||||
struct __queue free_recv_queue;
|
||||
struct __queue recv_pending_queue;
|
||||
struct __queue uc_swdec_pending_queue;
|
||||
|
||||
u8 *pallocated_frame_buf;
|
||||
u8 *precv_frame_buf;
|
||||
|
|
@ -223,12 +204,12 @@ struct recv_priv
|
|||
uint rx_middlepacket_crcerr;
|
||||
|
||||
//u8 *pallocated_urb_buf;
|
||||
_sema allrxreturnevt;
|
||||
struct semaphore allrxreturnevt;
|
||||
uint ff_hwaddr;
|
||||
u8 rx_pending_cnt;
|
||||
|
||||
#ifdef CONFIG_USB_INTERRUPT_IN_PIPE
|
||||
PURB int_in_urb;
|
||||
struct urb * int_in_urb;
|
||||
|
||||
u8 *int_in_buf;
|
||||
#endif //CONFIG_USB_INTERRUPT_IN_PIPE
|
||||
|
|
@ -244,7 +225,7 @@ struct recv_priv
|
|||
|
||||
u8 *pallocated_recv_buf;
|
||||
u8 *precv_buf; // 4 alignment
|
||||
_queue free_recv_buf_queue;
|
||||
struct __queue free_recv_buf_queue;
|
||||
u32 free_recv_buf_queue_cnt;
|
||||
|
||||
u8 is_signal_dbg; // for debug
|
||||
|
|
@ -258,7 +239,7 @@ struct recv_priv
|
|||
s8 RxRssi[2];
|
||||
int FalseAlmCnt_all;
|
||||
|
||||
_timer signal_stat_timer;
|
||||
struct timer_list signal_stat_timer;
|
||||
u32 signal_stat_sampling_interval;
|
||||
struct signal_stat signal_qual_data;
|
||||
struct signal_stat signal_strength_data;
|
||||
|
|
@ -268,48 +249,33 @@ struct recv_priv
|
|||
|
||||
struct sta_recv_priv {
|
||||
|
||||
_lock lock;
|
||||
spinlock_t lock;
|
||||
sint option;
|
||||
|
||||
//_queue blk_strms[MAX_RX_NUMBLKS];
|
||||
_queue defrag_q; //keeping the fragment frame until defrag
|
||||
|
||||
struct __queue defrag_q; //keeping the fragment frame until defrag
|
||||
struct stainfo_rxcache rxcache;
|
||||
|
||||
//uint sta_rx_bytes;
|
||||
//uint sta_rx_pkts;
|
||||
//uint sta_rx_fail;
|
||||
|
||||
};
|
||||
|
||||
|
||||
struct recv_buf
|
||||
{
|
||||
_list list;
|
||||
|
||||
_lock recvbuf_lock;
|
||||
|
||||
struct recv_buf {
|
||||
struct list_head list;
|
||||
spinlock_t recvbuf_lock;
|
||||
u32 ref_cnt;
|
||||
|
||||
struct adapter *adapter;
|
||||
|
||||
u8 *pbuf;
|
||||
u8 *pallocated_buf;
|
||||
|
||||
u32 len;
|
||||
u8 *phead;
|
||||
u8 *pdata;
|
||||
u8 *ptail;
|
||||
u8 *pend;
|
||||
|
||||
PURB purb;
|
||||
struct urb *purb;
|
||||
dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */
|
||||
u32 alloc_sz;
|
||||
|
||||
u8 irp_pending;
|
||||
int transfer_len;
|
||||
|
||||
_pkt *pskb;
|
||||
struct sk_buff *pskb;
|
||||
u8 reuse;
|
||||
};
|
||||
|
||||
|
|
@ -330,7 +296,7 @@ struct recv_buf
|
|||
|
||||
*/
|
||||
struct recv_frame_hdr {
|
||||
_list list;
|
||||
struct list_head list;
|
||||
struct sk_buff *pkt;
|
||||
struct sk_buff *pkt_newalloc;
|
||||
struct adapter *adapter;
|
||||
|
|
@ -359,27 +325,27 @@ struct recv_frame_hdr {
|
|||
|
||||
union recv_frame{
|
||||
union{
|
||||
_list list;
|
||||
struct list_head list;
|
||||
struct recv_frame_hdr hdr;
|
||||
uint mem[RECVFRAME_HDR_ALIGN>>2];
|
||||
}u;
|
||||
};
|
||||
|
||||
extern union recv_frame *_rtw_alloc_recvframe (_queue *pfree_recv_queue); //get a free recv_frame from pfree_recv_queue
|
||||
extern union recv_frame *rtw_alloc_recvframe (_queue *pfree_recv_queue); //get a free recv_frame from pfree_recv_queue
|
||||
extern union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue); //get a free recv_frame from pfree_recv_queue
|
||||
extern union recv_frame *rtw_alloc_recvframe (struct __queue *pfree_recv_queue); //get a free recv_frame from pfree_recv_queue
|
||||
extern void rtw_init_recvframe(union recv_frame *precvframe ,struct recv_priv *precvpriv);
|
||||
extern int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue);
|
||||
extern int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_queue);
|
||||
|
||||
#define rtw_dequeue_recvframe(queue) rtw_alloc_recvframe(queue)
|
||||
extern int _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue);
|
||||
extern int rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue);
|
||||
extern int _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue);
|
||||
extern int rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue);
|
||||
|
||||
extern void rtw_free_recvframe_queue(_queue *pframequeue, _queue *pfree_recv_queue);
|
||||
extern void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfree_recv_queue);
|
||||
u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter);
|
||||
|
||||
sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, _queue *queue);
|
||||
sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue);
|
||||
struct recv_buf *rtw_dequeue_recvbuf (_queue *queue);
|
||||
sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, struct __queue *queue);
|
||||
sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue);
|
||||
struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue);
|
||||
|
||||
void rtw_reordering_ctrl_timeout_handler(void *pcontext);
|
||||
|
||||
|
|
@ -518,9 +484,9 @@ __inline static u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz)
|
|||
|
||||
|
||||
|
||||
__inline static _buffer * get_rxbuf_desc(union recv_frame *precvframe)
|
||||
__inline static unsigned char *get_rxbuf_desc(union recv_frame *precvframe)
|
||||
{
|
||||
_buffer * buf_desc;
|
||||
unsigned char *buf_desc;
|
||||
|
||||
if(precvframe==NULL)
|
||||
return NULL;
|
||||
|
|
@ -538,7 +504,7 @@ __inline static union recv_frame *rxmem_to_recvframe(u8 *rxmem)
|
|||
|
||||
}
|
||||
|
||||
__inline static union recv_frame *pkt_to_recvframe(_pkt *pkt)
|
||||
__inline static union recv_frame *pkt_to_recvframe(struct sk_buff *pkt)
|
||||
{
|
||||
|
||||
u8 * buf_star;
|
||||
|
|
@ -548,7 +514,7 @@ __inline static union recv_frame *pkt_to_recvframe(_pkt *pkt)
|
|||
return precv_frame;
|
||||
}
|
||||
|
||||
__inline static u8 *pkt_to_recvmem(_pkt *pkt)
|
||||
__inline static u8 *pkt_to_recvmem(struct sk_buff *pkt)
|
||||
{
|
||||
// return the rx_head
|
||||
|
||||
|
|
@ -558,7 +524,7 @@ __inline static u8 *pkt_to_recvmem(_pkt *pkt)
|
|||
|
||||
}
|
||||
|
||||
__inline static u8 *pkt_to_recvdata(_pkt *pkt)
|
||||
__inline static u8 *pkt_to_recvdata(struct sk_buff *pkt)
|
||||
{
|
||||
// return the rx_data
|
||||
|
||||
|
|
|
|||
|
|
@ -158,18 +158,14 @@ struct security_priv
|
|||
u8 binstallBIPkey;
|
||||
#endif //CONFIG_IEEE80211W
|
||||
u8 busetkipkey;
|
||||
//_timer tkip_timer;
|
||||
u8 bcheck_grpkey;
|
||||
u8 bgrpkey_handshake;
|
||||
|
||||
//u8 packet_cnt;//unused, removed
|
||||
|
||||
s32 sw_encrypt;//from registry_priv
|
||||
s32 sw_decrypt;//from registry_priv
|
||||
|
||||
s32 hw_decrypted;//if the rx packets is hw_decrypted==false, it means the hw has not been ready.
|
||||
|
||||
|
||||
//keeps the auth_type & enc_status from upper layer ioctl(wpa_supplicant or wzc)
|
||||
u32 ndisauthtype; // enum NDIS_802_11_AUTHENTICATION_MODE
|
||||
u32 ndisencryptstatus; // NDIS_802_11_ENCRYPTION_STATUS
|
||||
|
|
@ -184,7 +180,6 @@ struct security_priv
|
|||
u8 authenticator_ie[256]; //store ap security information element
|
||||
u8 supplicant_ie[256]; //store sta security information element
|
||||
|
||||
|
||||
//for tkip countermeasure
|
||||
u32 last_mic_err_time;
|
||||
u8 btkip_countermeasure;
|
||||
|
|
|
|||
|
|
@ -119,11 +119,7 @@ union txdesc {
|
|||
};
|
||||
|
||||
struct hw_xmit {
|
||||
//_lock xmit_lock;
|
||||
//_list pending;
|
||||
_queue *sta_queue;
|
||||
//struct hw_txqueue *phwtxqueue;
|
||||
//sint txcmdcnt;
|
||||
struct __queue *sta_queue;
|
||||
int accnt;
|
||||
};
|
||||
|
||||
|
|
@ -218,7 +214,7 @@ void rtw_sctx_done(struct submit_ctx **sctx);
|
|||
|
||||
struct xmit_buf
|
||||
{
|
||||
_list list;
|
||||
struct list_head list;
|
||||
|
||||
struct adapter *padapter;
|
||||
|
||||
|
|
@ -238,7 +234,7 @@ struct xmit_buf
|
|||
|
||||
u32 ff_hwaddr;
|
||||
|
||||
PURB pxmit_urb[8];
|
||||
struct urb *pxmit_urb[8];
|
||||
dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */
|
||||
u8 bpending[8];
|
||||
|
||||
|
|
@ -251,13 +247,12 @@ struct xmit_buf
|
|||
};
|
||||
|
||||
|
||||
struct xmit_frame
|
||||
{
|
||||
_list list;
|
||||
struct xmit_frame {
|
||||
struct list_head list;
|
||||
|
||||
struct pkt_attrib attrib;
|
||||
|
||||
_pkt *pkt;
|
||||
struct sk_buff *pkt;
|
||||
|
||||
int frame_tag;
|
||||
|
||||
|
|
@ -278,34 +273,26 @@ struct xmit_frame
|
|||
};
|
||||
|
||||
struct tx_servq {
|
||||
_list tx_pending;
|
||||
_queue sta_pending;
|
||||
struct list_head tx_pending;
|
||||
struct __queue sta_pending;
|
||||
int qcnt;
|
||||
};
|
||||
|
||||
|
||||
struct sta_xmit_priv
|
||||
{
|
||||
_lock lock;
|
||||
spinlock_t lock;
|
||||
sint option;
|
||||
sint apsd_setting; //When bit mask is on, the associated edca queue supports APSD.
|
||||
|
||||
|
||||
//struct tx_servq blk_q[MAX_NUMBLKS];
|
||||
struct tx_servq be_q; //priority == 0,3
|
||||
struct tx_servq bk_q; //priority == 1,2
|
||||
struct tx_servq vi_q; //priority == 4,5
|
||||
struct tx_servq vo_q; //priority == 6,7
|
||||
_list legacy_dz;
|
||||
_list apsd;
|
||||
struct list_head legacy_dz;
|
||||
struct list_head apsd;
|
||||
|
||||
u16 txseq_tid[16];
|
||||
|
||||
//uint sta_tx_bytes;
|
||||
//u64 sta_tx_pkts;
|
||||
//uint sta_tx_fail;
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -327,39 +314,25 @@ struct agg_pkt_info{
|
|||
|
||||
struct xmit_priv {
|
||||
|
||||
_lock lock;
|
||||
spinlock_t lock;
|
||||
|
||||
_sema xmit_sema;
|
||||
_sema terminate_xmitthread_sema;
|
||||
|
||||
//_queue blk_strms[MAX_NUMBLKS];
|
||||
_queue be_pending;
|
||||
_queue bk_pending;
|
||||
_queue vi_pending;
|
||||
_queue vo_pending;
|
||||
_queue bm_pending;
|
||||
|
||||
//_queue legacy_dz_queue;
|
||||
//_queue apsd_queue;
|
||||
struct semaphore xmit_sema;
|
||||
struct semaphore terminate_xmitthread_sema;
|
||||
struct __queue be_pending;
|
||||
struct __queue bk_pending;
|
||||
struct __queue vi_pending;
|
||||
struct __queue vo_pending;
|
||||
struct __queue bm_pending;
|
||||
|
||||
u8 *pallocated_frame_buf;
|
||||
u8 *pxmit_frame_buf;
|
||||
uint free_xmitframe_cnt;
|
||||
_queue free_xmit_queue;
|
||||
|
||||
//uint mapping_addr;
|
||||
//uint pkt_sz;
|
||||
struct __queue free_xmit_queue;
|
||||
|
||||
u8 *xframe_ext_alloc_addr;
|
||||
u8 *xframe_ext;
|
||||
uint free_xframe_ext_cnt;
|
||||
_queue free_xframe_ext_queue;
|
||||
|
||||
//struct hw_txqueue be_txqueue;
|
||||
//struct hw_txqueue bk_txqueue;
|
||||
//struct hw_txqueue vi_txqueue;
|
||||
//struct hw_txqueue vo_txqueue;
|
||||
//struct hw_txqueue bmc_txqueue;
|
||||
struct __queue free_xframe_ext_queue;
|
||||
|
||||
uint frag_len;
|
||||
|
||||
|
|
@ -381,7 +354,7 @@ struct xmit_priv {
|
|||
|
||||
u8 wmm_para_seq[4];//sequence for wmm ac parameter strength from large to small. it's value is 0->vo, 1->vi, 2->be, 3->bk.
|
||||
|
||||
_sema tx_retevt;//all tx return event;
|
||||
struct semaphore tx_retevt;//all tx return event;
|
||||
u8 txirp_cnt;//
|
||||
|
||||
struct tasklet_struct xmit_tasklet;
|
||||
|
|
@ -391,13 +364,13 @@ struct xmit_priv {
|
|||
int viq_cnt;
|
||||
int voq_cnt;
|
||||
|
||||
_queue free_xmitbuf_queue;
|
||||
_queue pending_xmitbuf_queue;
|
||||
struct __queue free_xmitbuf_queue;
|
||||
struct __queue pending_xmitbuf_queue;
|
||||
u8 *pallocated_xmitbuf;
|
||||
u8 *pxmitbuf;
|
||||
uint free_xmitbuf_cnt;
|
||||
|
||||
_queue free_xmit_extbuf_queue;
|
||||
struct __queue free_xmit_extbuf_queue;
|
||||
u8 *pallocated_xmit_extbuf;
|
||||
u8 *pxmit_extbuf;
|
||||
uint free_xmit_extbuf_cnt;
|
||||
|
|
@ -406,7 +379,7 @@ struct xmit_priv {
|
|||
int ack_tx;
|
||||
_mutex ack_tx_mutex;
|
||||
struct submit_ctx ack_tx_ops;
|
||||
_lock lock_sctx;
|
||||
spinlock_t lock_sctx;
|
||||
};
|
||||
|
||||
extern struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv);
|
||||
|
|
@ -424,7 +397,7 @@ extern struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv);
|
|||
struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv);
|
||||
struct xmit_frame *rtw_alloc_xmitframe_once(struct xmit_priv *pxmitpriv);
|
||||
extern s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe);
|
||||
extern void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, _queue *pframequeue);
|
||||
extern void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue);
|
||||
struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, sint up, u8 *ac);
|
||||
extern s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe);
|
||||
extern struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, sint entry);
|
||||
|
|
@ -432,9 +405,9 @@ extern struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct
|
|||
extern s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe);
|
||||
extern u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pkt_attrib *pattrib);
|
||||
#define rtw_wlan_pkt_size(f) rtw_calculate_wlan_pkt_size_by_attribue(&f->attrib)
|
||||
extern s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe);
|
||||
extern s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe);
|
||||
#ifdef CONFIG_IEEE80211W
|
||||
extern s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe);
|
||||
extern s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe);
|
||||
#endif //CONFIG_IEEE80211W
|
||||
s32 _rtw_init_hw_txqueue(struct hw_txqueue* phw_txqueue, u8 ac_tag);
|
||||
void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv);
|
||||
|
|
@ -453,7 +426,7 @@ void rtw_alloc_hwxmits(struct adapter *padapter);
|
|||
void rtw_free_hwxmits(struct adapter *padapter);
|
||||
|
||||
|
||||
s32 rtw_xmit(struct adapter *padapter, _pkt **pkt);
|
||||
s32 rtw_xmit(struct adapter *padapter, struct sk_buff **pkt);
|
||||
|
||||
#if defined(CONFIG_AP_MODE)
|
||||
sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
//if mode ==0, then the sta is allowed once the addr is hit.
|
||||
//if mode ==1, then the sta is rejected once the addr is non-hit.
|
||||
struct rtw_wlan_acl_node {
|
||||
_list list;
|
||||
struct list_head list;
|
||||
u8 addr[ETH_ALEN];
|
||||
u8 valid;
|
||||
};
|
||||
|
|
@ -45,7 +45,7 @@ struct wlan_acl_pool {
|
|||
int mode;
|
||||
int num;
|
||||
struct rtw_wlan_acl_node aclnode[NUM_ACL];
|
||||
_queue acl_node_q;
|
||||
struct __queue acl_node_q;
|
||||
};
|
||||
|
||||
typedef struct _RSSI_STA{
|
||||
|
|
@ -87,18 +87,15 @@ struct stainfo_stats {
|
|||
|
||||
struct sta_info {
|
||||
|
||||
_lock lock;
|
||||
_list list; //free_sta_queue
|
||||
_list hash_list; //sta_hash
|
||||
//_list asoc_list; //20061114
|
||||
//_list sleep_list;//sleep_q
|
||||
//_list wakeup_list;//wakeup_q
|
||||
spinlock_t lock;
|
||||
struct list_head list; //free_sta_queue
|
||||
struct list_head hash_list; //sta_hash
|
||||
struct adapter *padapter;
|
||||
|
||||
struct sta_xmit_priv sta_xmitpriv;
|
||||
struct sta_recv_priv sta_recvpriv;
|
||||
|
||||
_queue sleep_q;
|
||||
struct __queue sleep_q;
|
||||
unsigned int sleepq_len;
|
||||
|
||||
uint state;
|
||||
|
|
@ -134,7 +131,7 @@ struct sta_info {
|
|||
struct stainfo_stats sta_stats;
|
||||
|
||||
//for A-MPDU TX, ADDBA timeout check
|
||||
_timer addba_retry_timer;
|
||||
struct timer_list addba_retry_timer;
|
||||
|
||||
//for A-MPDU Rx reordering buffer control
|
||||
struct recv_reorder_ctrl recvreorder_ctrl[16];
|
||||
|
|
@ -156,8 +153,8 @@ struct sta_info {
|
|||
|
||||
#ifdef CONFIG_AP_MODE
|
||||
|
||||
_list asoc_list;
|
||||
_list auth_list;
|
||||
struct list_head asoc_list;
|
||||
struct list_head auth_list;
|
||||
|
||||
unsigned int expire_to;
|
||||
unsigned int auth_seq;
|
||||
|
|
@ -353,22 +350,21 @@ struct sta_priv {
|
|||
|
||||
u8 *pallocated_stainfo_buf;
|
||||
u8 *pstainfo_buf;
|
||||
_queue free_sta_queue;
|
||||
struct __queue free_sta_queue;
|
||||
|
||||
_lock sta_hash_lock;
|
||||
_list sta_hash[NUM_STA];
|
||||
spinlock_t sta_hash_lock;
|
||||
struct list_head sta_hash[NUM_STA];
|
||||
int asoc_sta_count;
|
||||
_queue sleep_q;
|
||||
_queue wakeup_q;
|
||||
|
||||
struct __queue sleep_q;
|
||||
struct __queue wakeup_q;
|
||||
struct adapter *padapter;
|
||||
|
||||
|
||||
#ifdef CONFIG_AP_MODE
|
||||
_list asoc_list;
|
||||
_list auth_list;
|
||||
_lock asoc_list_lock;
|
||||
_lock auth_list_lock;
|
||||
struct list_head asoc_list;
|
||||
struct list_head auth_list;
|
||||
spinlock_t asoc_list_lock;
|
||||
spinlock_t auth_list_lock;
|
||||
u8 asoc_list_cnt;
|
||||
u8 auth_list_cnt;
|
||||
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ __inline static uint get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss)
|
|||
}
|
||||
|
||||
struct wlan_network {
|
||||
_list list;
|
||||
struct list_head list;
|
||||
int network_type; //refer to ieee80211.h for WIRELESS_11A/B/G
|
||||
int fixed; // set to fixed when not to be removed as site-surveying
|
||||
unsigned long last_scanned; //timestamp for the network
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@
|
|||
#include <drv_types.h>
|
||||
|
||||
struct pkt_file {
|
||||
_pkt *pkt;
|
||||
struct sk_buff *pkt;
|
||||
SIZE_T pkt_len; //the remainder length of the open_file
|
||||
_buffer *cur_buffer;
|
||||
unsigned char *cur_buffer;
|
||||
u8 *buf_start;
|
||||
u8 *cur_addr;
|
||||
SIZE_T buf_len;
|
||||
|
|
@ -41,8 +41,8 @@ struct sta_xmit_priv;
|
|||
struct xmit_frame;
|
||||
struct xmit_buf;
|
||||
|
||||
int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev);
|
||||
int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev);
|
||||
int _rtw_xmit_entry(struct sk_buff *pkt, struct net_device * pnetdev);
|
||||
int rtw_xmit_entry(struct sk_buff *pkt, struct net_device * pnetdev);
|
||||
|
||||
void rtw_os_xmit_schedule(struct adapter *padapter);
|
||||
|
||||
|
|
@ -50,11 +50,11 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb
|
|||
void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz);
|
||||
|
||||
uint rtw_remainder_len(struct pkt_file *pfile);
|
||||
void _rtw_open_pktfile(_pkt *pkt, struct pkt_file *pfile);
|
||||
void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile);
|
||||
uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen);
|
||||
sint rtw_endofpktfile (struct pkt_file *pfile);
|
||||
|
||||
void rtw_os_pkt_complete(struct adapter *padapter, _pkt *pkt);
|
||||
void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt);
|
||||
void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe);
|
||||
|
||||
#endif //__XMIT_OSDEP_H_
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue