Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mike McCormack and committed by
Greg Kroah-Hartman
dcf663fb 214985a6

+8 -20
+8 -20
drivers/staging/rtl8192e/r8192E_core.c
··· 1102 1102 { 1103 1103 struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); 1104 1104 int ret; 1105 - //unsigned long flags; 1106 1105 cb_desc *tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); 1107 1106 u8 queue_index = tcb_desc->queue_index; 1107 + 1108 1108 /* shall not be referred by command packet */ 1109 1109 assert(queue_index != TXCMD_QUEUE); 1110 1110 1111 - if (priv->bHwRadioOff ||(!priv->up)) 1111 + if (priv->bHwRadioOff || (!priv->up)) 1112 1112 { 1113 1113 kfree_skb(skb); 1114 1114 return; 1115 1115 } 1116 1116 1117 - //spin_lock_irqsave(&priv->tx_lock,flags); 1117 + memcpy(skb->cb, &dev, sizeof(dev)); 1118 1118 1119 - memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev)); 1120 - #if 0 1121 - tcb_desc->RATRIndex = 7; 1122 - tcb_desc->bTxDisableRateFallBack = 1; 1123 - tcb_desc->bTxUseDriverAssingedRate = 1; 1124 - tcb_desc->bTxEnableFwCalcDur = 1; 1125 - #endif 1126 1119 skb_push(skb, priv->ieee80211->tx_headroom); 1127 1120 ret = rtl8192_tx(dev, skb); 1128 - if(ret != 0) { 1121 + if (ret != 0) { 1129 1122 kfree_skb(skb); 1130 - }; 1131 - 1132 - // 1133 - if(queue_index!=MGNT_QUEUE) { 1134 - priv->ieee80211->stats.tx_bytes+=(skb->len - priv->ieee80211->tx_headroom); 1135 - priv->ieee80211->stats.tx_packets++; 1136 1123 } 1137 1124 1138 - //spin_unlock_irqrestore(&priv->tx_lock,flags); 1139 - 1140 - // return ret; 1125 + if (queue_index != MGNT_QUEUE) { 1126 + priv->ieee80211->stats.tx_bytes += (skb->len - priv->ieee80211->tx_headroom); 1127 + priv->ieee80211->stats.tx_packets++; 1128 + } 1141 1129 } 1142 1130 1143 1131 /*