net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions

[mirror_ubuntu-bionic-kernel.git] / drivers / net / typhoon.c

diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 9dd4f76a2ff5846ee4c14f066939593768e2a328..2c26b4577e8a07ecf893081b91b0fff584bd5f27 100644 (file)
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -909,7 +909,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
                        netif_wake_queue(dev);
        }
 
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static void
@@ -2406,7 +2406,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto error_out_disable;
        }
 
-       err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+       err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
        if(err < 0) {
                printk(ERR_PFX "%s: No usable DMA configuration\n",
                       pci_name(pdev));