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

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

staging: rtl8192e: Clean up rtl8192_hard_start_xmit() 



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

drivers/staging/rtl8192e/r8192E_core.c

+9 −23
Original line number Diff line number Diff line
@@ -1028,10 +1028,7 @@ 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;
@@ -1043,17 +1040,12 @@ static int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev) 
		}

        }



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



        memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));

        memcpy(skb->cb, &dev, sizeof(dev));

	if (queue_index == TXCMD_QUEUE) {

	//	skb_push(skb, USB_HWDESC_HEADER_LEN);

		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;
@@ -1062,16 +1054,10 @@ static int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev) 
		ret = rtl8192_tx(dev, skb);

		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;



}