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

Commit 529e5b32 authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman
Browse files

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



Lindented, cleared checkpatch findings and simplified error handling.

Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6d4e807c

drivers/staging/vt6656/main_usb.c

+22 −24
Original line number Diff line number Diff line
@@ -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) {

static int device_xmit(struct sk_buff *skb, struct net_device *dev)

{

	PSDevice pDevice = netdev_priv(dev);

    struct net_device_stats* pStats = &pDevice->stats;



	struct net_device_stats *stats = &pDevice->stats;



	spin_lock_irq(&pDevice->lock);



    netif_stop_queue(pDevice->dev);

	netif_stop_queue(dev);



    if (pDevice->bLinkPass == FALSE) {

	if (!pDevice->bLinkPass) {

		dev_kfree_skb_irq(skb);

        spin_unlock_irq(&pDevice->lock);

        return 0;

		goto out;

	}

    if (pDevice->bStopDataPkt == TRUE) {



	if (pDevice->bStopDataPkt) {

		dev_kfree_skb_irq(skb);

        pStats->tx_dropped++;

        spin_unlock_irq(&pDevice->lock);

        return 0;

		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);

	}



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)

{