| Message ID | 20091005132756.GA11704@ru.mvista.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Weird, I see my address in the to: line but I never got a copy in my inbox. On Mon, Oct 05, 2009 at 05:27:56PM +0400, Valentine Barshak wrote: > Not all pasemi mac interfaces can have a phy attached. > For example, XAUI has no phy and phydev is NULL for it. > In this case ethtool get settings causes kernel crash. > Fix it by returning -EOPNOTSUPP if there's no PHY attached. > > Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com> Acked-by: Olof Johansson <olof@lixom.net> > --- > drivers/net/pasemi_mac_ethtool.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff -pruN linux-2.6.orig/drivers/net/pasemi_mac_ethtool.c linux-2.6/drivers/net/pasemi_mac_ethtool.c > --- linux-2.6.orig/drivers/net/pasemi_mac_ethtool.c 2009-02-14 03:23:08.000000000 +0300 > +++ linux-2.6/drivers/net/pasemi_mac_ethtool.c 2009-10-05 16:21:52.000000000 +0400 > @@ -71,6 +71,9 @@ pasemi_mac_ethtool_get_settings(struct n > struct pasemi_mac *mac = netdev_priv(netdev); > struct phy_device *phydev = mac->phydev; > > + if (!phydev) > + return -EOPNOTSUPP; > + > return phy_ethtool_gset(phydev, cmd); > } > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Olof Johansson <olof@lixom.net> Date: Tue, 6 Oct 2009 11:10:54 -0500 > Weird, I see my address in the to: line but I never got a copy in my inbox. > > On Mon, Oct 05, 2009 at 05:27:56PM +0400, Valentine Barshak wrote: >> Not all pasemi mac interfaces can have a phy attached. >> For example, XAUI has no phy and phydev is NULL for it. >> In this case ethtool get settings causes kernel crash. >> Fix it by returning -EOPNOTSUPP if there's no PHY attached. >> >> Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com> > > Acked-by: Olof Johansson <olof@lixom.net> Applied to net-2.6, thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff -pruN linux-2.6.orig/drivers/net/pasemi_mac_ethtool.c linux-2.6/drivers/net/pasemi_mac_ethtool.c --- linux-2.6.orig/drivers/net/pasemi_mac_ethtool.c 2009-02-14 03:23:08.000000000 +0300 +++ linux-2.6/drivers/net/pasemi_mac_ethtool.c 2009-10-05 16:21:52.000000000 +0400 @@ -71,6 +71,9 @@ pasemi_mac_ethtool_get_settings(struct n struct pasemi_mac *mac = netdev_priv(netdev); struct phy_device *phydev = mac->phydev; + if (!phydev) + return -EOPNOTSUPP; + return phy_ethtool_gset(phydev, cmd); }
Not all pasemi mac interfaces can have a phy attached. For example, XAUI has no phy and phydev is NULL for it. In this case ethtool get settings causes kernel crash. Fix it by returning -EOPNOTSUPP if there's no PHY attached. Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com> --- drivers/net/pasemi_mac_ethtool.c | 3 +++ 1 file changed, 3 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html