Commit c1d7c48f authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: fec: reorder ethtool ops to match order in struct declaration 



This allows us to merge two separate preprocessor conditionals together.

Acked-by: default avatarFugang Duan <B38611@freescale.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db3421c1

drivers/net/ethernet/freescale/fec_main.c

+5 −7
Original line number Diff line number Diff line
@@ -2014,21 +2014,19 @@ static int fec_enet_nway_reset(struct net_device *dev) 
}



static const struct ethtool_ops fec_enet_ethtool_ops = {

#if !defined(CONFIG_M5272)

	.get_pauseparam		= fec_enet_get_pauseparam,

	.set_pauseparam		= fec_enet_set_pauseparam,

#endif

	.get_settings		= fec_enet_get_settings,

	.set_settings		= fec_enet_set_settings,

	.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,

	.get_link		= ethtool_op_get_link,

#ifndef CONFIG_M5272

	.get_ethtool_stats	= fec_enet_get_ethtool_stats,

	.get_pauseparam		= fec_enet_get_pauseparam,

	.set_pauseparam		= fec_enet_set_pauseparam,

	.get_strings		= fec_enet_get_strings,

	.get_ethtool_stats	= fec_enet_get_ethtool_stats,

	.get_sset_count		= fec_enet_get_sset_count,

#endif

	.get_ts_info		= fec_enet_get_ts_info,

};



static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)

CRA Git | Maintained and supported by SUSTech CRA and CCSE