Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219963
b: refs/heads/master
c: 162f535
h: refs/heads/master
i:
  219961: 8934e94
  219959: b31c4c3
v: v3
  • Loading branch information
Mike McCormack authored and Greg Kroah-Hartman committed Sep 21, 2010
1 parent 9bc1893 commit 8a68ec7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 24 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 09585fbdc6b903d6cd418378b22a3c578fabc327
refs/heads/master: 162f535f3fdd5b5fe463dcd86847e545a9efd067
32 changes: 9 additions & 23 deletions trunk/drivers/staging/rtl8192e/r8192E_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

}


Expand Down

0 comments on commit 8a68ec7

Please sign in to comment.