Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcf663fb authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Clean up rtl8192_hard_data_xmit() 



Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 214985a6

drivers/staging/rtl8192e/r8192E_core.c

+8 −20
Original line number Original line Diff line number Diff line
@@ -1102,9 +1102,9 @@ 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);
@@ -1114,30 +1114,18 @@ static void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, 
		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) {

	if (queue_index != MGNT_QUEUE) {

		priv->ieee80211->stats.tx_bytes += (skb->len - priv->ieee80211->tx_headroom);

		priv->ieee80211->stats.tx_bytes += (skb->len - priv->ieee80211->tx_headroom);

		priv->ieee80211->stats.tx_packets++;

		priv->ieee80211->stats.tx_packets++;

	}

	}



	//spin_unlock_irqrestore(&priv->tx_lock,flags);



//	return ret;

}

}





/*

/*