UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8192e: Clean up rtl8192_hard_data_xmit() 

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack 2010-09-20 23:11:40 +09:00 committed by Greg Kroah-Hartman
parent 214985a6d5
commit dcf663fba4
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/rtl8192e/r8192E_core.c
View File

@ -1102,42 +1102,30 @@ static void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
{ {
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
int ret; int ret;
//unsigned long flags;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
u8 queue_index = tcb_desc->queue_index; u8 queue_index = tcb_desc->queue_index;
/* shall not be referred by command packet */ /* shall not be referred by command packet */
assert(queue_index != TXCMD_QUEUE); assert(queue_index != TXCMD_QUEUE);
if (priv->bHwRadioOff ||(!priv->up)) if (priv->bHwRadioOff || (!priv->up))
{ {
kfree_skb(skb); kfree_skb(skb);
return; return;
} }
//spin_lock_irqsave(&priv->tx_lock,flags); memcpy(skb->cb, &dev, sizeof(dev));
memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
#if 0
tcb_desc->RATRIndex = 7;
tcb_desc->bTxDisableRateFallBack = 1;
tcb_desc->bTxUseDriverAssingedRate = 1;
tcb_desc->bTxEnableFwCalcDur = 1;
#endif
skb_push(skb, priv->ieee80211->tx_headroom); skb_push(skb, priv->ieee80211->tx_headroom);
ret = rtl8192_tx(dev, skb); ret = rtl8192_tx(dev, skb);
if(ret != 0) { if (ret != 0) {
kfree_skb(skb); kfree_skb(skb);
};
//
if(queue_index!=MGNT_QUEUE) {
priv->ieee80211->stats.tx_bytes+=(skb->len - priv->ieee80211->tx_headroom);
priv->ieee80211->stats.tx_packets++;
} }
//spin_unlock_irqrestore(&priv->tx_lock,flags); if (queue_index != MGNT_QUEUE) {
priv->ieee80211->stats.tx_bytes += (skb->len - priv->ieee80211->tx_headroom);
// return ret; priv->ieee80211->stats.tx_packets++;
}
} }
/* /*