Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f85de666 authored by Nikita Yushchenko's avatar Nikita Yushchenko Committed by David S. Miller
Browse files

net: fec: fix compile with CONFIG_M5272 



Commit 80cca775 ("net: fec: cache statistics while device is down")
introduced unconditional statistics-related actions.

However, when driver is compiled with CONFIG_M5272, staticsics-related
definitions do not exist, which results into build errors.

Fix that by adding explicit handling of !defined(CONFIG_M5272) case.

Fixes: 80cca775 ("net: fec: cache statistics while device is down")
Signed-off-by: default avatarNikita Yushchenko <nikita.yoush@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d14584d9

drivers/net/ethernet/freescale/fec_main.c

+10 −3
Original line number Diff line number Diff line
@@ -2313,6 +2313,8 @@ static const struct fec_stat { 
	{ "IEEE_rx_octets_ok", IEEE_R_OCTETS_OK },

};



#define FEC_STATS_SIZE		(ARRAY_SIZE(fec_stats) * sizeof(u64))



static void fec_enet_update_ethtool_stats(struct net_device *dev)

{

	struct fec_enet_private *fep = netdev_priv(dev);
@@ -2330,7 +2332,7 @@ static void fec_enet_get_ethtool_stats(struct net_device *dev, 
	if (netif_running(dev))

		fec_enet_update_ethtool_stats(dev);



	memcpy(data, fep->ethtool_stats, ARRAY_SIZE(fec_stats) * sizeof(u64));

	memcpy(data, fep->ethtool_stats, FEC_STATS_SIZE);

}



static void fec_enet_get_strings(struct net_device *netdev,
@@ -2355,6 +2357,12 @@ static int fec_enet_get_sset_count(struct net_device *dev, int sset) 
		return -EOPNOTSUPP;

	}

}



#else	/* !defined(CONFIG_M5272) */

#define FEC_STATS_SIZE	0

static inline void fec_enet_update_ethtool_stats(struct net_device *dev)

{

}

#endif /* !defined(CONFIG_M5272) */



static int fec_enet_nway_reset(struct net_device *dev)
@@ -3293,8 +3301,7 @@ fec_probe(struct platform_device *pdev) 


	/* Init network device */

	ndev = alloc_etherdev_mqs(sizeof(struct fec_enet_private) +

				  ARRAY_SIZE(fec_stats) * sizeof(u64),

				  num_tx_qs, num_rx_qs);

				  FEC_STATS_SIZE, num_tx_qs, num_rx_qs);

	if (!ndev)

		return -ENOMEM;