generic: mvswitch: add detach callback

Use the detach callback to disable packet mangling
to avoid possible NULL pointer dereference.

Compile tested only.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35512

diff --git a/target/linux/generic/files/drivers/net/phy/mvswitch.c b/target/linux/generic/files/drivers/net/phy/mvswitch.c
index d754951aca362dcca6f1c37d6ea1f9b23db6ebc0..af73ec22a0d96cae8a1b01fd3d9bd0d31ef5938e 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/mvswitch.c
+++ b/target/linux/generic/files/drivers/net/phy/mvswitch.c
@@ -348,16 +348,26 @@ mvswitch_config_aneg(struct phy_device *phydev)
 }
 
 static void
-mvswitch_remove(struct phy_device *pdev)
+mvswitch_detach(struct phy_device *pdev)
 {
        struct mvswitch_priv *priv = to_mvsw(pdev);
        struct net_device *dev = pdev->attached_dev;
 
+       if (!dev)
+               return;
+
        dev->phy_ptr = NULL;
        dev->eth_mangle_rx = NULL;
        dev->eth_mangle_tx = NULL;
        dev->features = priv->orig_features;
        dev->priv_flags &= ~IFF_NO_IP_ALIGN;
+}
+
+static void
+mvswitch_remove(struct phy_device *pdev)
+{
+       struct mvswitch_priv *priv = to_mvsw(pdev);
+
        kfree(priv);
 }
 
@@ -399,6 +409,7 @@ static struct phy_driver mvswitch_driver = {
        .features       = PHY_BASIC_FEATURES,
        .probe          = &mvswitch_probe,
        .remove         = &mvswitch_remove,
+       .detach         = &mvswitch_detach,
        .config_init    = &mvswitch_config_init,
        .config_aneg    = &mvswitch_config_aneg,
        .read_status    = &mvswitch_read_status,