Message ID | 1497058642-31542-1-git-send-email-festevam@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Fabio Estevam <festevam@gmail.com> Date: Fri, 9 Jun 2017 22:37:22 -0300 > From: Fabio Estevam <fabio.estevam@nxp.com> > > Commit 2b30842b23b9 ("net: fec: Clear and enable MIB counters on imx51") > introduced fec_enet_clear_ethtool_stats(), but missed to add a stub > for the CONFIG_M5272=y case, causing build failure for the > m5272c3_defconfig. > > Add the missing empty stub to fix the build failure. > > Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Applied, thanks.
On Sat, Jun 10, 2017 at 5:16 PM, David Miller <davem@davemloft.net> wrote: > From: Fabio Estevam <festevam@gmail.com> > Date: Fri, 9 Jun 2017 22:37:22 -0300 > >> From: Fabio Estevam <fabio.estevam@nxp.com> >> >> Commit 2b30842b23b9 ("net: fec: Clear and enable MIB counters on imx51") >> introduced fec_enet_clear_ethtool_stats(), but missed to add a stub >> for the CONFIG_M5272=y case, causing build failure for the >> m5272c3_defconfig. >> >> Add the missing empty stub to fix the build failure. >> >> Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> >> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > > Applied, thanks. I should have marked net-next in the Subject. Commit 2b30842b23b9 ("net: fec: Clear and enable MIB counters on imx51") is in net-next, so this one should go to net-next, not to net. Sorry about that.
From: Fabio Estevam <festevam@gmail.com> Date: Sat, 10 Jun 2017 17:33:01 -0300 > On Sat, Jun 10, 2017 at 5:16 PM, David Miller <davem@davemloft.net> wrote: >> From: Fabio Estevam <festevam@gmail.com> >> Date: Fri, 9 Jun 2017 22:37:22 -0300 >> >>> From: Fabio Estevam <fabio.estevam@nxp.com> >>> >>> Commit 2b30842b23b9 ("net: fec: Clear and enable MIB counters on imx51") >>> introduced fec_enet_clear_ethtool_stats(), but missed to add a stub >>> for the CONFIG_M5272=y case, causing build failure for the >>> m5272c3_defconfig. >>> >>> Add the missing empty stub to fix the build failure. >>> >>> Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> >>> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> >> >> Applied, thanks. > > I should have marked net-next in the Subject. > > Commit 2b30842b23b9 ("net: fec: Clear and enable MIB counters on > imx51") is in net-next, so this one should go to net-next, not to net. > > Sorry about that. Ok, reverted from 'net' and applied to 'net-next' with an appropriate Fixes: tag added. Thanks.
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 297fd19..a6e323f 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2379,6 +2379,10 @@ static void fec_enet_clear_ethtool_stats(struct net_device *dev) static inline void fec_enet_update_ethtool_stats(struct net_device *dev) { } + +static inline void fec_enet_clear_ethtool_stats(struct net_device *dev) +{ +} #endif /* !defined(CONFIG_M5272) */ /* ITR clock source is enet system clock (clk_ahb).