Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219956
b: refs/heads/master
c: dcf663f
h: refs/heads/master
v: v3
  • Loading branch information
Mike McCormack authored and Greg Kroah-Hartman committed Sep 21, 2010
1 parent 207b1f6 commit b549af6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 21 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: 214985a6d507694e9ede71936387cabb37d3378a
refs/heads/master: dcf663fba428a95b43ddc6c996f987b032c5d291
28 changes: 8 additions & 20 deletions trunk/drivers/staging/rtl8192e/r8192E_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
int ret;
//unsigned long flags;
cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
u8 queue_index = tcb_desc->queue_index;

/* shall not be referred by command packet */
assert(queue_index != TXCMD_QUEUE);

if (priv->bHwRadioOff ||(!priv->up))
if (priv->bHwRadioOff || (!priv->up))
{
kfree_skb(skb);
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);
ret = rtl8192_tx(dev, skb);
if(ret != 0) {
if (ret != 0) {
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);

// return ret;
if (queue_index != MGNT_QUEUE) {
priv->ieee80211->stats.tx_bytes += (skb->len - priv->ieee80211->tx_headroom);
priv->ieee80211->stats.tx_packets++;
}
}

/*
Expand Down

0 comments on commit b549af6

Please sign in to comment.