35dc676ba3
Drop upstreamed patches, refresh remaining patches. Signed-off-by: ZiMing Mo <msylgj@immortalwrt.org> [rebased upon HEAD] Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
21 lines
563 B
Diff
21 lines
563 B
Diff
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
@@ -7361,6 +7361,7 @@ int stmmac_dvr_probe(struct device *devi
|
|
{
|
|
struct net_device *ndev = NULL;
|
|
struct stmmac_priv *priv;
|
|
+ const char *devname = of_get_property(device->of_node, "label", NULL);
|
|
u32 rxq;
|
|
int i, ret = 0;
|
|
|
|
@@ -7369,6 +7370,9 @@ int stmmac_dvr_probe(struct device *devi
|
|
if (!ndev)
|
|
return -ENOMEM;
|
|
|
|
+ if (devname)
|
|
+ strlcpy(ndev->name, devname, IFNAMSIZ);
|
|
+
|
|
SET_NETDEV_DEV(ndev, device);
|
|
|
|
priv = netdev_priv(ndev);
|