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

Commit 8f728d79 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

sh_eth: split 'sh_eth_netdev_ops' 



Commit 9f861341 (sh_eth: remove SH_ETH_HAS_TSU)
removes 'const' from 'sh_eth_netdev_ops'  and modifies it in case TSU registers
are present. I've originally suggested to Iwamatsu-san to split  this structure
in two instead and afterwards Dave M. suggested doing the same.
Split 'sh_eth_netdev_ops_tsu' from 'sh_eth_netdev_ops', making both 'const', and
assigning 'ndev->detdev_ops'  depending on the presence of TSU registers.

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c70eba74

drivers/net/ethernet/renesas/sh_eth.c

+20 −9
Original line number Diff line number Diff line
@@ -2486,7 +2486,7 @@ static const u16 *sh_eth_get_register_offset(int register_type) 
	return reg_offset;

}



static struct net_device_ops sh_eth_netdev_ops = {

static const struct net_device_ops sh_eth_netdev_ops = {

	.ndo_open		= sh_eth_open,

	.ndo_stop		= sh_eth_close,

	.ndo_start_xmit		= sh_eth_start_xmit,
@@ -2498,6 +2498,21 @@ static struct net_device_ops sh_eth_netdev_ops = { 
	.ndo_change_mtu		= eth_change_mtu,

};



static const struct net_device_ops sh_eth_netdev_ops_tsu = {

	.ndo_open		= sh_eth_open,

	.ndo_stop		= sh_eth_close,

	.ndo_start_xmit		= sh_eth_start_xmit,

	.ndo_get_stats		= sh_eth_get_stats,

	.ndo_set_rx_mode	= sh_eth_set_multicast_list,

	.ndo_vlan_rx_add_vid	= sh_eth_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= sh_eth_vlan_rx_kill_vid,

	.ndo_tx_timeout		= sh_eth_tx_timeout,

	.ndo_do_ioctl		= sh_eth_do_ioctl,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_change_mtu		= eth_change_mtu,

};



static int sh_eth_drv_probe(struct platform_device *pdev)

{

	int ret, devno = 0;
@@ -2568,13 +2583,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev) 
	sh_eth_set_default_cpu_data(mdp->cd);



	/* set function */

	if (mdp->cd->tsu) {

		sh_eth_netdev_ops.ndo_set_rx_mode = sh_eth_set_multicast_list;

		sh_eth_netdev_ops.ndo_vlan_rx_add_vid = sh_eth_vlan_rx_add_vid;

		sh_eth_netdev_ops.ndo_vlan_rx_kill_vid =

			sh_eth_vlan_rx_kill_vid;

	}



	if (mdp->cd->tsu)

		ndev->netdev_ops = &sh_eth_netdev_ops_tsu;

	else

		ndev->netdev_ops = &sh_eth_netdev_ops;

	SET_ETHTOOL_OPS(ndev, &sh_eth_ethtool_ops);

	ndev->watchdog_timeo = TX_TIMEOUT;