On Tue, 31 Mar 2009 12:44:15 +0200
Henk Stegeman <henk.stege...@gmail.com> wrote:
> Fix fec_mpc52xx driver to use net_device_ops and to be careful not to
> dereference phy_device if a phy has not yet been connected.
>
> Signed-off-by: Henk Stegeman <henk.stege...@gmail.com>
>
> diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
> index cd8e98b..ca76b95 100644
> --- a/drivers/net/fec_mpc52xx.c
> +++ b/drivers/net/fec_mpc52xx.c
> @@ -847,24 +847,40 @@ static void mpc52xx_fec_get_drvinfo(struct
> net_device *dev,
> static int mpc52xx_fec_get_settings(struct net_device *dev, struct
> ethtool_cmd *cmd)
> {
> struct mpc52xx_fec_priv *priv = netdev_priv(dev);
> +
> + if (!priv->phydev)
> + return -ENODEV;
> +
> return phy_ethtool_gset(priv->phydev, cmd);
> }
>
> static int mpc52xx_fec_set_settings(struct net_device *dev, struct
> ethtool_cmd *cmd)
> {
> struct mpc52xx_fec_priv *priv = netdev_priv(dev);
> +
> + if (!priv->phydev)
> + return -ENODEV;
> +
> return phy_ethtool_sset(priv->phydev, cmd);
> }
>
> static u32 mpc52xx_fec_get_msglevel(struct net_device *dev)
> {
> struct mpc52xx_fec_priv *priv = netdev_priv(dev);
> +
> + if (!priv->phydev)
> + return 0;
> +
> return priv->msg_enable;
> }
>
> static void mpc52xx_fec_set_msglevel(struct net_device *dev, u32 level)
> {
> struct mpc52xx_fec_priv *priv = netdev_priv(dev);
> +
> + if (!priv->phydev)
> + return;
> +
> priv->msg_enable = level;
> }
>
> @@ -882,12 +898,31 @@ static int mpc52xx_fec_ioctl(struct net_device
> *dev, struct ifreq *rq, int cmd)
> {
> struct mpc52xx_fec_priv *priv = netdev_priv(dev);
>
> + if (!priv->phydev)
> + return -ENODEV;
> +
> return mpc52xx_fec_phy_mii_ioctl(priv, if_mii(rq), cmd);
> }
>
> /* ========================================================================
> */
> /* OF Driver
> */
> /* ========================================================================
> */
> +static const struct net_device_ops mpc52xx_fec_netdev_ops = {
> + .ndo_open = mpc52xx_fec_open,
> + .ndo_stop = mpc52xx_fec_close,
> + .ndo_start_xmit = mpc52xx_fec_hard_start_xmit,
> + .ndo_tx_timeout = mpc52xx_fec_tx_timeout,
> + .ndo_get_stats = mpc52xx_fec_get_stats,
> + .ndo_set_multicast_list = mpc52xx_fec_set_multicast_list,
> + .ndo_validate_addr = eth_validate_addr,
> + .ndo_set_mac_address = mpc52xx_fec_set_mac_address,
> + .ndo_do_ioctl = mpc52xx_fec_ioctl,
>
What about change_mtu? Don't you want:
.ndo_change_mtu = eth_change_mtu,
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
