OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192e: Clean up rtl8192_hard_start_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:12:50 +09:00 committed by Greg Kroah-Hartman
parent 09585fbdc6
commit 162f535f3f
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1028,50 +1028,36 @@ static void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev,
static int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev)
{
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
int ret;
//unsigned long flags;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
u8 queue_index = tcb_desc->queue_index;
if(queue_index != TXCMD_QUEUE){
if (priv->bHwRadioOff ||(!priv->up))
if (queue_index != TXCMD_QUEUE) {
if (priv->bHwRadioOff || (!priv->up))
{
kfree_skb(skb);
return 0;
}
kfree_skb(skb);
return 0;
}
}
//spin_lock_irqsave(&priv->tx_lock,flags);
memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
if(queue_index == TXCMD_QUEUE) {
// skb_push(skb, USB_HWDESC_HEADER_LEN);
memcpy(skb->cb, &dev, sizeof(dev));
if (queue_index == TXCMD_QUEUE) {
rtl819xE_tx_cmd(dev, skb);
ret = 0;
//spin_unlock_irqrestore(&priv->tx_lock,flags);
return ret;
} else {
// RT_TRACE(COMP_SEND, "To send management packet\n");
tcb_desc->RATRIndex = 7;
tcb_desc->bTxDisableRateFallBack = 1;
tcb_desc->bTxUseDriverAssingedRate = 1;
tcb_desc->bTxEnableFwCalcDur = 1;
skb_push(skb, priv->ieee80211->tx_headroom);
ret = rtl8192_tx(dev, skb);
if(ret != 0) {
if (ret != 0) {
kfree_skb(skb);
};
}
}
// priv->ieee80211->stats.tx_bytes+=skb->len;
// priv->ieee80211->stats.tx_packets++;
//spin_unlock_irqrestore(&priv->tx_lock,flags);
return ret;
}