| Message ID | 1371427478-25902-1-git-send-email-cphealy@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 17-06-2013 4:04, cphealy@gmail.com wrote: > From: Chris <cphealy@gmail.com> > Add ethtool operation to restart autonegotiation via the PHY. > Also cleanup two whitespace errors that break kernel guidelines. This "also" is asking for another patch. > Tested on i.MX28EVK. > Signed-off-by: Chris <cphealy@gmail.com> You must specify your full name. > --- > drivers/net/ethernet/freescale/fec_main.c | 17 ++++++++++++++--- > 1 file changed, 14 insertions(+), 3 deletions(-) > diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c > index a667015..c6be728 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -150,7 +150,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); > #define FEC_FLASHMAC 0xf0006000 > #elif defined(CONFIG_CANCam) > #define FEC_FLASHMAC 0xf0020000 > -#elif defined (CONFIG_M5272C3) > +#elif defined(CONFIG_M5272C3) > #define FEC_FLASHMAC (0xffe04000 + 4) > #elif defined(CONFIG_MOD5272) > #define FEC_FLASHMAC 0xffc0406b > @@ -1206,8 +1206,7 @@ static int fec_enet_mii_probe(struct net_device *ndev) > if (id_entry->driver_data & FEC_QUIRK_HAS_GBIT) { > phy_dev->supported &= PHY_GBIT_FEATURES; > phy_dev->supported |= SUPPORTED_Pause; > - } > - else > + } else > phy_dev->supported &= PHY_BASIC_FEATURES; According to Documentation/CodingStyle, *else* branch should have {}, as *if* branch has it. WBR, Sergei -- 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 --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index a667015..c6be728 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -150,7 +150,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); #define FEC_FLASHMAC 0xf0006000 #elif defined(CONFIG_CANCam) #define FEC_FLASHMAC 0xf0020000 -#elif defined (CONFIG_M5272C3) +#elif defined(CONFIG_M5272C3) #define FEC_FLASHMAC (0xffe04000 + 4) #elif defined(CONFIG_MOD5272) #define FEC_FLASHMAC 0xffc0406b @@ -1206,8 +1206,7 @@ static int fec_enet_mii_probe(struct net_device *ndev) if (id_entry->driver_data & FEC_QUIRK_HAS_GBIT) { phy_dev->supported &= PHY_GBIT_FEATURES; phy_dev->supported |= SUPPORTED_Pause; - } - else + } else phy_dev->supported &= PHY_BASIC_FEATURES; phy_dev->advertising = phy_dev->supported; @@ -1436,6 +1435,17 @@ static int fec_enet_set_pauseparam(struct net_device *ndev, return 0; } +static int fec_enet_nway_reset(struct net_device *dev) +{ + struct fec_enet_private *fep = netdev_priv(dev); + struct phy_device *phydev = fep->phy_dev; + + if (!phydev) + return -ENODEV; + + return genphy_restart_aneg(phydev); +} + static const struct ethtool_ops fec_enet_ethtool_ops = { .get_pauseparam = fec_enet_get_pauseparam, .set_pauseparam = fec_enet_set_pauseparam, @@ -1444,6 +1454,7 @@ static const struct ethtool_ops fec_enet_ethtool_ops = { .get_drvinfo = fec_enet_get_drvinfo, .get_link = ethtool_op_get_link, .get_ts_info = fec_enet_get_ts_info, + .nway_reset = fec_enet_nway_reset, }; static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)