OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: vt6656: code cleanup in device_netdev_ops' device_xmit() 

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>
This commit is contained in:
Andres More 2010-07-12 19:28:25 -03:00 committed by Greg Kroah-Hartman
parent 6d4e807c5a
commit 529e5b3235
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/staging/vt6656/main_usb.c
View File

@ -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)
{