27 lines
964 B
Diff
27 lines
964 B
Diff
Index: drivers/net/ethernet/freescale/fec_main.c
|
|
===================================================================
|
|
--- drivers/net/ethernet/freescale/fec_main.c
|
|
+++ linux-imx/drivers/net/ethernet/freescale/fec_main.c
|
|
@@ -3630,12 +3630,19 @@ fec_probe(struct platform_device *pdev)
|
|
struct device_node *np = pdev->dev.of_node, *phy_node;
|
|
int num_tx_qs;
|
|
int num_rx_qs;
|
|
+ const char *dev_name;
|
|
|
|
fec_enet_get_queue_num(pdev, &num_tx_qs, &num_rx_qs);
|
|
|
|
/* Init network device */
|
|
- ndev = alloc_etherdev_mqs(sizeof(struct fec_enet_private) +
|
|
- FEC_STATS_SIZE, num_tx_qs, num_rx_qs);
|
|
+ dev_name = of_get_property(np, "fsl,devname", NULL);
|
|
+ if (dev_name)
|
|
+ ndev = alloc_netdev_mqs(sizeof(struct fec_enet_private) +
|
|
+ FEC_STATS_SIZE, dev_name, NET_NAME_UNKNOWN,
|
|
+ ether_setup, num_tx_qs, num_rx_qs);
|
|
+ else
|
|
+ ndev = alloc_etherdev_mqs(sizeof(struct fec_enet_private) +
|
|
+ FEC_STATS_SIZE, num_tx_qs, num_rx_qs);
|
|
if (!ndev)
|
|
return -ENOMEM;
|
|
|