skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove most typedef statements from include/osdep_service.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-16 08:54:18 -05:00
parent 26b163f24f
commit e2285839e9
46 changed files with 531 additions and 733 deletions
Download patch file Download diff file Expand all files Collapse all files

20
os_dep/ioctl_cfg80211.c
View file

@ -1742,7 +1742,7 @@ exit:
void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool aborted)
{
_irqL irqL;
unsigned long irqL;
spin_lock_bh(&pwdev_priv->scan_req_lock);
if(pwdev_priv->scan_request != NULL)
@ -1776,10 +1776,10 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool abor
void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)
{
_irqL irqL;
_list *plist, *phead;
unsigned long irqL;
struct list_head *plist, *phead;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
_queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
u32 cnt=0;
u32 wait_for_surveydone;
@ -1956,7 +1956,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];
struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT];
_irqL irqL;
unsigned long irqL;
u8 *wps_ie=NULL;
uint wps_ielen=0;
u8 *p2p_ie=NULL;
@ -2522,8 +2522,8 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_connect_params *sme)
{
int ret=0;
_irqL irqL;
_list *phead;
unsigned long irqL;
struct list_head *phead;
struct wlan_network *pnetwork = NULL;
enum NDIS_802_11_AUTHENTICATION_MODE authmode;
struct ndis_802_11_ssid ndis_ssid;
@ -2535,7 +2535,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv *psecuritypriv = &padapter->securitypriv;
_queue *queue = &pmlmepriv->scanned_queue;
struct __queue *queue = &pmlmepriv->scanned_queue;
padapter->mlmepriv.not_indic_disco = true;
@ -3525,8 +3525,8 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
#endif
{
int ret=0;
_irqL irqL;
_list *phead, *plist;
unsigned long irqL;
struct list_head *phead, *plist;
u8 updated;
struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev);

109
os_dep/ioctl_linux.c
View file

@ -1377,14 +1377,14 @@ static int rtw_wx_set_wap(struct net_device *dev,
union iwreq_data *awrq,
char *extra)
{
_irqL irqL;
unsigned long irqL;
uint ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct sockaddr *temp = (struct sockaddr *)awrq;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
_list *phead;
struct list_head *phead;
u8 *dst_bssid, *src_bssid;
_queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
enum NDIS_802_11_AUTHENTICATION_MODE authmode;
@ -1530,7 +1530,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];
_irqL irqL;
unsigned long irqL;
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
#endif /* CONFIG_P2P */
@ -1719,11 +1719,11 @@ exit:
static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
union iwreq_data *wrqu, char *extra)
{
_irqL irqL;
_list *plist, *phead;
unsigned long irqL;
struct list_head *plist, *phead;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
_queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
char *ev = extra;
char *stop = ev + wrqu->data.length;
@ -1833,11 +1833,11 @@ static int rtw_wx_set_essid(struct net_device *dev,
struct iw_request_info *a,
union iwreq_data *wrqu, char *extra)
{
_irqL irqL;
unsigned long irqL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_queue *queue = &pmlmepriv->scanned_queue;
_list *phead;
struct __queue *queue = &pmlmepriv->scanned_queue;
struct list_head *phead;
s8 status = true;
struct wlan_network *pnetwork = NULL;
enum NDIS_802_11_AUTHENTICATION_MODE authmode;
@ -3080,15 +3080,15 @@ static int rtw_get_ap_info(struct net_device *dev,
{
int bssid_match, ret = 0;
u32 cnt=0, wpa_ielen;
_irqL irqL;
_list *plist, *phead;
unsigned long irqL;
struct list_head *plist, *phead;
unsigned char *pbuf;
u8 bssid[ETH_ALEN];
char data[32];
struct wlan_network *pnetwork = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
_queue *queue = &(pmlmepriv->scanned_queue);
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct iw_point *pdata = &wrqu->data;
DBG_871X("+rtw_get_aplist_info\n");
@ -3705,9 +3705,9 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
u8 peerMAC[ETH_ALEN] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL;
_list * plist,*phead;
_queue *queue = &(pmlmepriv->scanned_queue);
unsigned long irqL;
struct list_head *plist,*phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0;
__be16 be_attr_content = 0;
@ -3839,9 +3839,9 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
u8 peerMAC[ETH_ALEN] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL;
_list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue);
unsigned long irqL;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0;
u8 *p2pie;
@ -3929,9 +3929,9 @@ static int rtw_p2p_get_device_type(struct net_device *dev,
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
u8 peerMAC[ETH_ALEN] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL;
_list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue);
unsigned long irqL;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0;
u8 dev_type[8] = { 0x00 };
@ -4004,9 +4004,9 @@ static int rtw_p2p_get_device_name(struct net_device *dev,
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
u8 peerMAC[ETH_ALEN] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL;
_list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue);
unsigned long irqL;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0;
u8 dev_name[WPS_MAX_DEVICE_NAME_LEN] = { 0x00 };
@ -4075,9 +4075,9 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev,
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
u8 peerMAC[ETH_ALEN] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL;
_list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue);
unsigned long irqL;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
u8 blnMatch = 0;
u8 *p2pie;
@ -4161,9 +4161,9 @@ static int rtw_p2p_connect(struct net_device *dev,
int jj,kk;
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_irqL irqL;
_list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue);
unsigned long irqL;
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0;
@ -4256,14 +4256,14 @@ static int rtw_p2p_invite_req(struct net_device *dev,
int jj,kk;
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue);
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0;
u8 attr_content[50] = { 0x00 }, _status = 0;
u8 *p2pie;
uint p2pielen = 0, attr_contentlen = 0;
_irqL irqL;
unsigned long irqL;
struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info;
#ifdef CONFIG_P2P
@ -4436,14 +4436,14 @@ static int rtw_p2p_set_persistent(struct net_device *dev,
int jj,kk;
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue);
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0;
u8 attr_content[50] = { 0x00 }, _status = 0;
u8 *p2pie;
uint p2pielen = 0, attr_contentlen = 0;
_irqL irqL;
unsigned long irqL;
struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info;
#ifdef CONFIG_P2P
@ -4572,13 +4572,13 @@ static int rtw_p2p_set_pc(struct net_device *dev,
int jj,kk;
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue);
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
u8 attr_content[50] = { 0x00 }, _status = 0;
u8 *p2pie;
uint p2pielen = 0, attr_contentlen = 0;
_irqL irqL;
unsigned long irqL;
uint uintPeerChannel = 0;
struct wifi_display_info* pwfd_info = pwdinfo->wfd_info;
@ -4869,14 +4869,14 @@ static int rtw_p2p_prov_disc(struct net_device *dev,
int jj,kk;
u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 };
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
_list *plist, *phead;
_queue *queue = &(pmlmepriv->scanned_queue);
struct list_head *plist, *phead;
struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL;
uint uintPeerChannel = 0;
u8 attr_content[100] = { 0x00 }, _status = 0;
u8 *p2pie;
uint p2pielen = 0, attr_contentlen = 0;
_irqL irqL;
unsigned long irqL;
u8 ie_offset;
#ifdef CONFIG_P2P
@ -5505,7 +5505,7 @@ static int rtw_dbg_port(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
_irqL irqL;
unsigned long irqL;
int ret = 0;
u8 major_cmd, minor_cmd;
u16 arg;
@ -5842,7 +5842,7 @@ static int rtw_dbg_port(struct net_device *dev,
case 0x09:
{
int i, j;
_list *plist, *phead;
struct list_head *plist, *phead;
struct recv_reorder_ctrl *preorder_ctrl;
#ifdef CONFIG_AP_MODE
@ -5905,7 +5905,7 @@ static int rtw_dbg_port(struct net_device *dev,
{
#ifdef DBG_TRX_STA_PKTS
int i, j;
_list *plist, *phead;
struct list_head *plist, *phead;
spin_lock_bh(&pstapriv->sta_hash_lock);
@ -6796,12 +6796,8 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int
static int rtw_hostapd_sta_flush(struct net_device *dev)
{
/* _irqL irqL; */
/* _list *phead, *plist; */
int ret=0;
/* struct sta_info *psta = NULL; */
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
/* struct sta_priv *pstapriv = &padapter->stapriv; */
int ret=0;
DBG_871X("%s\n", __FUNCTION__);
@ -6815,7 +6811,7 @@ static int rtw_hostapd_sta_flush(struct net_device *dev)
static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
{
_irqL irqL;
unsigned long irqL;
int ret=0;
struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
@ -6882,7 +6878,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)
{
_irqL irqL;
unsigned long irqL;
int ret=0;
struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
@ -8745,7 +8741,7 @@ static s32 createpseudoadhoc(struct adapter *padapter)
u8 *pibss;
u8 ssid[] = "pseduo_ad-hoc";
s32 err;
_irqL irqL;
unsigned long irqL;
pmlmepriv = &padapter->mlmepriv;
@ -8811,7 +8807,7 @@ static struct xmit_frame* createloopbackpkt(struct adapter *padapter, u32 size)
u8 *pkt_start, *pkt_end, *ptr;
struct rtw_ieee80211_hdr *hdr;
s32 bmcast;
_irqL irqL;
unsigned long irqL;
if ((TXDESC_SIZE + WLANHDR_OFFSET + size) > MAX_XMITBUF_SZ) return NULL;
@ -8857,7 +8853,6 @@ static struct xmit_frame* createloopbackpkt(struct adapter *padapter, u32 size)
pattrib->subtype = WIFI_DATA;
pattrib->priority = 0;
pattrib->qsel = pattrib->priority;
/* do_queue_select(padapter, pattrib); */
pattrib->nr_frags = 1;
pattrib->encrypt = 0;
pattrib->bswenc = false;
@ -9030,7 +9025,7 @@ static u8 pktcmp(struct adapter *padapter, u8 *txbuf, u32 txsz, u8 *rxbuf, u32 r
return ret;
}
thread_return lbk_thread(thread_context context)
int lbk_thread(void * context)
{
s32 err;
struct adapter *padapter;

2
os_dep/mlme_linux.c
View file

@ -103,7 +103,7 @@ void rtw_reset_securitypriv( struct adapter *adapter )
u8 backupTKIPCountermeasure = 0x00;
u32 backupTKIPcountermeasure_time = 0;
/* add for CONFIG_IEEE80211W, none 11w also can use */
_irqL irqL;
unsigned long irqL;
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
spin_lock_bh(&adapter->security_key_mutex);

4
os_dep/os_intfs.c
View file

@ -228,7 +228,7 @@ MODULE_PARM_DESC(rtw_notch_filter, "0:Disable, 1:Enable, 2:Enable only for P2P")
module_param_named(debug, rtw_debug, int, 0444);
MODULE_PARM_DESC(debug, "Set debug level (1-9) (default 1)");
static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev);
static uint loadparam(struct adapter *padapter, struct net_device * pnetdev);
int _netdev_open(struct net_device *pnetdev);
int netdev_open (struct net_device *pnetdev);
static int netdev_close (struct net_device *pnetdev);
@ -251,7 +251,7 @@ void rtw_proc_remove_one(struct net_device *dev)
}
#endif
static uint loadparam( struct adapter *padapter, _nic_hdl pnetdev)
static uint loadparam( struct adapter *padapter, struct net_device * pnetdev)
{
uint status = _SUCCESS;

26
os_dep/osdep_service.c
View file

@ -136,7 +136,7 @@ inline struct sk_buff *_rtw_skb_clone(struct sk_buff *skb)
return skb_clone(skb, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
}
inline int _rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb)
inline int _rtw_netif_rx(struct net_device * ndev, struct sk_buff *skb)
{
skb->dev = ndev;
return netif_rx(skb);
@ -474,7 +474,7 @@ inline struct sk_buff *dbg_rtw_skb_clone(struct sk_buff *skb, const enum mstat_f
return skb_cl;
}
inline int dbg_rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line)
inline int dbg_rtw_netif_rx(struct net_device * ndev, struct sk_buff *skb, const enum mstat_f flags, const char *func, int line)
{
int ret;
unsigned int truesize = skb->truesize;
@ -562,7 +562,7 @@ int _rtw_memcmp(void *dst, void *src, u32 sz)
return false;
}
void _rtw_init_listhead(_list *list)
void _rtw_init_listhead(struct list_head *list)
{
INIT_LIST_HEAD(list);
}
@ -573,7 +573,7 @@ For the following list_xxx operations,
caller must guarantee the atomic context.
Otherwise, there will be racing condition.
*/
u32 rtw_is_list_empty(_list *phead)
u32 rtw_is_list_empty(struct list_head *phead)
{
if (list_empty(phead))
return true;
@ -581,12 +581,12 @@ u32 rtw_is_list_empty(_list *phead)
return false;
}
void rtw_list_insert_head(_list *plist, _list *phead)
void rtw_list_insert_head(struct list_head *plist, struct list_head *phead)
{
list_add(plist, phead);
}
void rtw_list_insert_tail(_list *plist, _list *phead)
void rtw_list_insert_tail(struct list_head *plist, struct list_head *phead)
{
list_add_tail(plist, phead);
}
@ -599,21 +599,21 @@ Caller must check if the list is empty before calling rtw_list_delete
*/
void _rtw_init_sema(_sema *sema, int init_val)
void _rtw_init_sema(struct semaphore *sema, int init_val)
{
sema_init(sema, init_val);
}
void _rtw_free_sema(_sema *sema)
void _rtw_free_sema(struct semaphore *sema)
{
}
void _rtw_up_sema(_sema *sema)
void _rtw_up_sema(struct semaphore *sema)
{
up(sema);
}
u32 _rtw_down_sema(_sema *sema)
u32 _rtw_down_sema(struct semaphore *sema)
{
if (down_interruptible(sema))
return _FAIL;
@ -639,7 +639,7 @@ void _rtw_mutex_free(_mutex *pmutex)
#endif
}
void _rtw_init_queue(_queue *pqueue)
void _rtw_init_queue(struct __queue *pqueue)
{
_rtw_init_listhead(&(pqueue->queue));
@ -648,13 +648,13 @@ void _rtw_init_queue(_queue *pqueue)
}
u32 _rtw_queue_empty(_queue *pqueue)
u32 _rtw_queue_empty(struct __queue *pqueue)
{
return (rtw_is_list_empty(&(pqueue->queue)));
}
u32 rtw_end_of_queue_search(_list *head, _list *plist)
u32 rtw_end_of_queue_search(struct list_head *head, struct list_head *plist)
{
if (head == plist)
return true;

8
os_dep/recv_linux.c
View file

@ -158,7 +158,7 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup)
void rtw_hostapd_mlme_rx(struct adapter *padapter, union recv_frame *precv_frame)
{
#ifdef CONFIG_HOSTAPD_MLME
_pkt *skb;
struct sk_buff *skb;
struct hostapd_priv *phostapdpriv = padapter->phostapdpriv;
struct net_device *pmgnt_netdev = phostapdpriv->pmgnt_netdev;
@ -194,8 +194,8 @@ void rtw_hostapd_mlme_rx(struct adapter *padapter, union recv_frame *precv_frame
int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame)
{
struct recv_priv *precvpriv;
_queue *pfree_recv_queue;
_pkt *skb;
struct __queue *pfree_recv_queue;
struct sk_buff *skb;
struct mlme_priv*pmlmepriv = &padapter->mlmepriv;
#ifdef CONFIG_BR_EXT
void *br_port = NULL;
@ -234,7 +234,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
{
_pkt *pskb2=NULL;
struct sk_buff *pskb2=NULL;
struct sta_info *psta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv;
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;

10
os_dep/usb_ops_linux.c
View file

@ -215,7 +215,7 @@ static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr)
u32 ret;
unsigned char *pbuf;
struct zero_bulkout_context *pcontext;
PURB purb = NULL;
struct urb * purb = NULL;
struct adapter *padapter = (struct adapter *)pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct usb_device *pusbd = pdvobj->pusbdev;
@ -305,7 +305,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl)
static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
{
_irqL irqL;
unsigned long irqL;
int i;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context;
/* struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data; */
@ -413,11 +413,11 @@ check_completion:
u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
{
_irqL irqL;
unsigned long irqL;
unsigned int pipe;
int status;
u32 ret = _FAIL, bwritezero = false;
PURB purb = NULL;
struct urb *purb = NULL;
struct adapter *padapter = (struct adapter *)pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -426,8 +426,6 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
struct usb_device *pusbd = pdvobj->pusbdev;
struct pkt_attrib *pattrib = &pxmitframe->attrib;
;
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("+usb_write_port\n"));
if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx)) {

17
os_dep/xmit_linux.c
View file

@ -36,7 +36,7 @@ uint rtw_remainder_len(struct pkt_file *pfile)
return (pfile->buf_len - ((SIZE_PTR)(pfile->cur_addr) - (SIZE_PTR)(pfile->buf_start)));
}
void _rtw_open_pktfile (_pkt *pktptr, struct pkt_file *pfile)
void _rtw_open_pktfile (struct sk_buff *pktptr, struct pkt_file *pfile)
{
;
@ -120,7 +120,7 @@ void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitb
#define WMM_XMIT_THRESHOLD (NR_XMITFRAME*2/5)
void rtw_os_pkt_complete(struct adapter *padapter, _pkt *pkt)
void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt)
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
u16 queue;
@ -157,7 +157,7 @@ void rtw_os_xmit_schedule(struct adapter *padapter)
{
struct adapter *pri_adapter = padapter;
_irqL irqL;
unsigned long irqL;
struct xmit_priv *pxmitpriv;
if(!padapter)
@ -173,7 +173,7 @@ void rtw_os_xmit_schedule(struct adapter *padapter)
spin_unlock_bh(&pxmitpriv->lock);
}
static void rtw_check_xmit_resource(struct adapter *padapter, _pkt *pkt)
static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_buff *pkt)
{
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
@ -205,15 +205,14 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
{
struct sta_priv *pstapriv = &padapter->stapriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_irqL irqL;
_list *phead, *plist;
unsigned long irqL;
struct list_head *phead, *plist;
struct sk_buff *newskb;
struct sta_info *psta = NULL;
u8 chk_alive_num = 0;
char chk_alive_list[NUM_STA];
u8 bc_addr[6]={0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
u8 null_addr[6]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
int i;
s32 res;
@ -269,7 +268,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
return true;
}
int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
int _rtw_xmit_entry(struct sk_buff *pkt, struct net_device * pnetdev)
{
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -332,7 +331,7 @@ exit:
return 0;
}
int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
int rtw_xmit_entry(struct sk_buff *pkt, struct net_device * pnetdev)
{
if (pkt)
rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, pkt->truesize);