Skip to contentSkip to conversation

patch "staging: octeon: Call SET_NETDEV_DEV()" added to staging-linus

PATCH [email protected] 1 participant 1 message Jan 3, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

staging: octeon: Call SET_NETDEV_DEV()

to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

Quoted 1 line

From e7c9a3d9e432200fd4c17855c2c23ac784d6e833 Mon Sep 17 00:00:00 2001

From: Florian Fainelli <[email protected]>
Date: Wed, 14 Dec 2016 17:13:24 -0800
Subject: staging: octeon: Call SET_NETDEV_DEV()

The Octeon driver calls into PHYLIB which now checks for net_device->dev.parent, so make sure we do set it before calling into any MDIO/PHYLIB related function.

Fixes ec988ad78ed6 ("phy: Don't increment MDIO bus refcount unless it's a different owner")
Cc stable <[email protected]> # 4.9+
---
 drivers/staging/octeon/ethernet.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/staging/octeon/ethernet.c +2 -0
index 8130dfe89745..4971aa54756a 100644
@@ -770,6 +770,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
 			/* Initialize the device private structure. */
 			struct octeon_ethernet *priv = netdev_priv(dev);
 
+			SET_NETDEV_DEV(dev, &pdev->dev);
 			dev->netdev_ops = &cvm_oct_pow_netdev_ops;
 			priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
 			priv->port = CVMX_PIP_NUM_INPUT_PORTS;
@@ -816,6 +817,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
 			}
 
 			/* Initialize the device private structure. */
+			SET_NETDEV_DEV(dev, &pdev->dev);
 			priv = netdev_priv(dev);
 			priv->netdev = dev;
 			priv->of_node = cvm_oct_node_for_port(pip, interface,
Signature · 1 line
2.11.0