Commit 6e800557 authored by David S. Miller's avatar David S. Miller

Merge branch 'fec-fixes'

Joakim Zhang says:

====================
net: fixes for fec driver

Two small fixes for fec driver.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 171c3b15 052fcc45
...@@ -1662,7 +1662,7 @@ static int fec_enet_rx_napi(struct napi_struct *napi, int budget) ...@@ -1662,7 +1662,7 @@ static int fec_enet_rx_napi(struct napi_struct *napi, int budget)
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
static void fec_get_mac(struct net_device *ndev) static int fec_get_mac(struct net_device *ndev)
{ {
struct fec_enet_private *fep = netdev_priv(ndev); struct fec_enet_private *fep = netdev_priv(ndev);
unsigned char *iap, tmpaddr[ETH_ALEN]; unsigned char *iap, tmpaddr[ETH_ALEN];
...@@ -1685,6 +1685,8 @@ static void fec_get_mac(struct net_device *ndev) ...@@ -1685,6 +1685,8 @@ static void fec_get_mac(struct net_device *ndev)
ret = of_get_mac_address(np, tmpaddr); ret = of_get_mac_address(np, tmpaddr);
if (!ret) if (!ret)
iap = tmpaddr; iap = tmpaddr;
else if (ret == -EPROBE_DEFER)
return ret;
} }
} }
...@@ -1723,7 +1725,7 @@ static void fec_get_mac(struct net_device *ndev) ...@@ -1723,7 +1725,7 @@ static void fec_get_mac(struct net_device *ndev)
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);
dev_info(&fep->pdev->dev, "Using random MAC address: %pM\n", dev_info(&fep->pdev->dev, "Using random MAC address: %pM\n",
ndev->dev_addr); ndev->dev_addr);
return; return 0;
} }
memcpy(ndev->dev_addr, iap, ETH_ALEN); memcpy(ndev->dev_addr, iap, ETH_ALEN);
...@@ -1731,6 +1733,8 @@ static void fec_get_mac(struct net_device *ndev) ...@@ -1731,6 +1733,8 @@ static void fec_get_mac(struct net_device *ndev)
/* Adjust MAC if using macaddr */ /* Adjust MAC if using macaddr */
if (iap == macaddr) if (iap == macaddr)
ndev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->dev_id; ndev->dev_addr[ETH_ALEN-1] = macaddr[ETH_ALEN-1] + fep->dev_id;
return 0;
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
...@@ -3290,7 +3294,9 @@ static int fec_enet_init(struct net_device *ndev) ...@@ -3290,7 +3294,9 @@ static int fec_enet_init(struct net_device *ndev)
return ret; return ret;
} }
fec_enet_alloc_queue(ndev); ret = fec_enet_alloc_queue(ndev);
if (ret)
return ret;
bd_size = (fep->total_tx_ring_size + fep->total_rx_ring_size) * dsize; bd_size = (fep->total_tx_ring_size + fep->total_rx_ring_size) * dsize;
...@@ -3298,11 +3304,15 @@ static int fec_enet_init(struct net_device *ndev) ...@@ -3298,11 +3304,15 @@ static int fec_enet_init(struct net_device *ndev)
cbd_base = dmam_alloc_coherent(&fep->pdev->dev, bd_size, &bd_dma, cbd_base = dmam_alloc_coherent(&fep->pdev->dev, bd_size, &bd_dma,
GFP_KERNEL); GFP_KERNEL);
if (!cbd_base) { if (!cbd_base) {
return -ENOMEM; ret = -ENOMEM;
goto free_queue_mem;
} }
/* Get the Ethernet address */ /* Get the Ethernet address */
fec_get_mac(ndev); ret = fec_get_mac(ndev);
if (ret)
goto free_queue_mem;
/* make sure MAC we just acquired is programmed into the hw */ /* make sure MAC we just acquired is programmed into the hw */
fec_set_mac_address(ndev, NULL); fec_set_mac_address(ndev, NULL);
...@@ -3376,6 +3386,10 @@ static int fec_enet_init(struct net_device *ndev) ...@@ -3376,6 +3386,10 @@ static int fec_enet_init(struct net_device *ndev)
fec_enet_update_ethtool_stats(ndev); fec_enet_update_ethtool_stats(ndev);
return 0; return 0;
free_queue_mem:
fec_enet_free_queue(ndev);
return ret;
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment