From ca8152eb8c66049c2a5bbcfd6a57b3ebde13b80a Mon Sep 17 00:00:00 2001 From: Andres More Date: Mon, 12 Jul 2010 13:10:27 -0300 Subject: [PATCH] --- yaml --- r: 205898 b: refs/heads/master c: e1669ed0d4424f406120e9d8fad8a9935bce340c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6656/main_usb.c | 32 ++++++++----------------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index a87d2ed688d9..036a090bfcf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a8b0055267930bddd7d11e69875576c71dec343 +refs/heads/master: e1669ed0d4424f406120e9d8fad8a9935bce340c diff --git a/trunk/drivers/staging/vt6656/main_usb.c b/trunk/drivers/staging/vt6656/main_usb.c index 51a858fa79ab..d943fb965ff6 100644 --- a/trunk/drivers/staging/vt6656/main_usb.c +++ b/trunk/drivers/staging/vt6656/main_usb.c @@ -1292,34 +1292,22 @@ static void __devexit vt6656_disconnect(struct usb_interface *intf) } } -static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) { - PSDevice pDevice=netdev_priv(dev); - PBYTE pbMPDU; - unsigned int cbMPDULen = 0; - - - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_tx_80211\n"); - spin_lock_irq(&pDevice->lock); - - if (pDevice->bStopTx0Pkt == TRUE) { - dev_kfree_skb_irq(skb); - spin_unlock_irq(&pDevice->lock); - return 0; - }; - - - cbMPDULen = skb->len; - pbMPDU = skb->data; +static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) +{ + PSDevice pDevice = netdev_priv(dev); - vDMA0_tx_80211(pDevice, skb); + spin_lock_irq(&pDevice->lock); - spin_unlock_irq(&pDevice->lock); + if (unlikely(pDevice->bStopTx0Pkt)) + dev_kfree_skb_irq(skb); + else + vDMA0_tx_80211(pDevice, skb); - return 0; + spin_unlock_irq(&pDevice->lock); + return NETDEV_TX_OK; } - static int device_xmit(struct sk_buff *skb, struct net_device *dev) { PSDevice pDevice=netdev_priv(dev); struct net_device_stats* pStats = &pDevice->stats;