diff options
Diffstat (limited to 'drivers/net/e100.c')
-rw-r--r-- | drivers/net/e100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index eb169a8e8773..7a6aeae2c9fa 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1478,7 +1478,7 @@ static inline int e100_rx_alloc_skb(struct nic *nic, struct rx *rx) | |||
1478 | 1478 | ||
1479 | if(pci_dma_mapping_error(rx->dma_addr)) { | 1479 | if(pci_dma_mapping_error(rx->dma_addr)) { |
1480 | dev_kfree_skb_any(rx->skb); | 1480 | dev_kfree_skb_any(rx->skb); |
1481 | rx->skb = 0; | 1481 | rx->skb = NULL; |
1482 | rx->dma_addr = 0; | 1482 | rx->dma_addr = 0; |
1483 | return -ENOMEM; | 1483 | return -ENOMEM; |
1484 | } | 1484 | } |
@@ -1764,7 +1764,7 @@ static int e100_up(struct nic *nic) | |||
1764 | if((err = e100_hw_init(nic))) | 1764 | if((err = e100_hw_init(nic))) |
1765 | goto err_clean_cbs; | 1765 | goto err_clean_cbs; |
1766 | e100_set_multicast_list(nic->netdev); | 1766 | e100_set_multicast_list(nic->netdev); |
1767 | e100_start_receiver(nic, 0); | 1767 | e100_start_receiver(nic, NULL); |
1768 | mod_timer(&nic->watchdog, jiffies); | 1768 | mod_timer(&nic->watchdog, jiffies); |
1769 | if((err = request_irq(nic->pdev->irq, e100_intr, SA_SHIRQ, | 1769 | if((err = request_irq(nic->pdev->irq, e100_intr, SA_SHIRQ, |
1770 | nic->netdev->name, nic->netdev))) | 1770 | nic->netdev->name, nic->netdev))) |
@@ -1844,7 +1844,7 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode) | |||
1844 | mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, | 1844 | mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, |
1845 | BMCR_LOOPBACK); | 1845 | BMCR_LOOPBACK); |
1846 | 1846 | ||
1847 | e100_start_receiver(nic, 0); | 1847 | e100_start_receiver(nic, NULL); |
1848 | 1848 | ||
1849 | if(!(skb = dev_alloc_skb(ETH_DATA_LEN))) { | 1849 | if(!(skb = dev_alloc_skb(ETH_DATA_LEN))) { |
1850 | err = -ENOMEM; | 1850 | err = -ENOMEM; |