Commit cb21104f authored by Biju Das's avatar Biju Das Committed by David S. Miller
Browse files

ravb: Factorise ravb_adjust_link function 



R-Car supports 100 and 1000 Mbps transfer speed whereas RZ/G2L
in addition support 10Mbps. Factorise ravb_adjust_link function
in order to support 10Mbps speed.

Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5d95c11

drivers/net/ethernet/renesas/ravb.h

+1 −0
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ struct ravb_hw_info { 
	void (*rx_ring_format)(struct net_device *ndev, int q);

	void *(*alloc_rx_desc)(struct net_device *ndev, int q);

	bool (*receive)(struct net_device *ndev, int *quota, int q);

	void (*set_rate)(struct net_device *ndev);

	const char (*gstrings_stats)[ETH_GSTRING_LEN];

	size_t gstrings_size;

	netdev_features_t net_hw_features;

drivers/net/ethernet/renesas/ravb_main.c

+4 −1
Original line number Diff line number Diff line
@@ -996,6 +996,7 @@ static int ravb_poll(struct napi_struct *napi, int budget) 
static void ravb_adjust_link(struct net_device *ndev)

{

	struct ravb_private *priv = netdev_priv(ndev);

	const struct ravb_hw_info *info = priv->info;

	struct phy_device *phydev = ndev->phydev;

	bool new_state = false;

	unsigned long flags;
@@ -1010,7 +1011,7 @@ static void ravb_adjust_link(struct net_device *ndev) 
		if (phydev->speed != priv->speed) {

			new_state = true;

			priv->speed = phydev->speed;

			ravb_set_rate(ndev);

			info->set_rate(ndev);

		}

		if (!priv->link) {

			ravb_modify(ndev, ECMR, ECMR_TXF, 0);
@@ -1978,6 +1979,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = { 
	.rx_ring_format = ravb_rx_ring_format,

	.alloc_rx_desc = ravb_alloc_rx_desc,

	.receive = ravb_rcar_rx,

	.set_rate = ravb_set_rate,

	.gstrings_stats = ravb_gstrings_stats,

	.gstrings_size = sizeof(ravb_gstrings_stats),

	.net_hw_features = NETIF_F_RXCSUM,
@@ -1995,6 +1997,7 @@ static const struct ravb_hw_info ravb_gen2_hw_info = { 
	.rx_ring_format = ravb_rx_ring_format,

	.alloc_rx_desc = ravb_alloc_rx_desc,

	.receive = ravb_rcar_rx,

	.set_rate = ravb_set_rate,

	.gstrings_stats = ravb_gstrings_stats,

	.gstrings_size = sizeof(ravb_gstrings_stats),

	.net_hw_features = NETIF_F_RXCSUM,