cdc-phonet: autoconfigure Phonet address
[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / net / typhoon.c
index 9dd4f76a2ff5846ee4c14f066939593768e2a328..d6d345229fe941cdc95d52dc5a3f7fcbfb1ad4e8 100644 (file)
@@ -762,7 +762,7 @@ typhoon_tso_fill(struct sk_buff *skb, struct transmit_ring *txRing,
        tcpd->status = 0;
 }
 
-static int
+static netdev_tx_t
 typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
 {
        struct typhoon *tp = netdev_priv(dev);
@@ -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));