Skip to content

Commit

Permalink
staging: vt6656: code cleanup in device_netdev_ops' device_xmit()
Browse files Browse the repository at this point in the history
Lindented, cleared checkpatch findings and simplified error handling.

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Andres More authored and Greg Kroah-Hartman committed Jul 22, 2010
1 parent 6d4e807 commit 529e5b3
Showing 1 changed file with 22 additions and 24 deletions.
46 changes: 22 additions & 24 deletions drivers/staging/vt6656/main_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1306,39 +1306,37 @@ static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev)
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;
static int device_xmit(struct sk_buff *skb, struct net_device *dev)
{
PSDevice pDevice = netdev_priv(dev);
struct net_device_stats *stats = &pDevice->stats;

spin_lock_irq(&pDevice->lock);

spin_lock_irq(&pDevice->lock);
netif_stop_queue(dev);

netif_stop_queue(pDevice->dev);
if (!pDevice->bLinkPass) {
dev_kfree_skb_irq(skb);
goto out;
}

if (pDevice->bLinkPass == FALSE) {
dev_kfree_skb_irq(skb);
spin_unlock_irq(&pDevice->lock);
return 0;
}
if (pDevice->bStopDataPkt == TRUE) {
dev_kfree_skb_irq(skb);
pStats->tx_dropped++;
spin_unlock_irq(&pDevice->lock);
return 0;
}
if (pDevice->bStopDataPkt) {
dev_kfree_skb_irq(skb);
stats->tx_dropped++;
goto out;
}

if(nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) !=0) { //mike add:xmit fail!
if (netif_queue_stopped(pDevice->dev))
netif_wake_queue(pDevice->dev);
}
if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb)) {
if (netif_queue_stopped(dev))
netif_wake_queue(dev);
}

spin_unlock_irq(&pDevice->lock);
out:
spin_unlock_irq(&pDevice->lock);

return 0;
return NETDEV_TX_OK;
}



static unsigned const ethernet_polynomial = 0x04c11db7U;
static inline u32 ether_crc(int length, unsigned char *data)
{
Expand Down

0 comments on commit 529e5b3

Please sign in to comment.