---

yaml --- r: 205898 b: refs/heads/master c: e1669ed h: refs/heads/master v: v3
git-mirror · Jul 22, 2010 · ca8152e · ca8152e
1 parent 29f669b
commit ca8152e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
diff --git 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
@@ -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;