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

ravb: Rename "ravb_set_features_rx_csum" function to "ravb_set_features_rcar" 



Rename "ravb_set_features_rx_csum" function to "ravb_set_features_rcar" and
replace the function pointer "set_rx_csum_feature" with "set_feature".

Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Suggested-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b7b0c30

drivers/net/ethernet/renesas/ravb.h

+1 −1
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@ struct ravb_hw_info { 
	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);

	int (*set_rx_csum_feature)(struct net_device *ndev, netdev_features_t features);

	int (*set_feature)(struct net_device *ndev, netdev_features_t features);

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

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

	const char (*gstrings_stats)[ETH_GSTRING_LEN];

drivers/net/ethernet/renesas/ravb_main.c

+5 −5
Original line number Diff line number Diff line
@@ -1918,7 +1918,7 @@ static void ravb_set_rx_csum(struct net_device *ndev, bool enable) 
	spin_unlock_irqrestore(&priv->lock, flags);

}



static int ravb_set_features_rx_csum(struct net_device *ndev,

static int ravb_set_features_rcar(struct net_device *ndev,

				  netdev_features_t features)

{

	netdev_features_t changed = ndev->features ^ features;
@@ -1937,7 +1937,7 @@ static int ravb_set_features(struct net_device *ndev, 
	struct ravb_private *priv = netdev_priv(ndev);

	const struct ravb_hw_info *info = priv->info;



	return info->set_rx_csum_feature(ndev, features);

	return info->set_feature(ndev, features);

}



static const struct net_device_ops ravb_netdev_ops = {
@@ -2006,7 +2006,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = { 
	.alloc_rx_desc = ravb_alloc_rx_desc,

	.receive = ravb_rcar_rx,

	.set_rate = ravb_set_rate,

	.set_rx_csum_feature = ravb_set_features_rx_csum,

	.set_feature = ravb_set_features_rcar,

	.dmac_init = ravb_rcar_dmac_init,

	.emac_init = ravb_rcar_emac_init,

	.gstrings_stats = ravb_gstrings_stats,
@@ -2027,7 +2027,7 @@ static const struct ravb_hw_info ravb_gen2_hw_info = { 
	.alloc_rx_desc = ravb_alloc_rx_desc,

	.receive = ravb_rcar_rx,

	.set_rate = ravb_set_rate,

	.set_rx_csum_feature = ravb_set_features_rx_csum,

	.set_feature = ravb_set_features_rcar,

	.dmac_init = ravb_rcar_dmac_init,

	.emac_init = ravb_rcar_emac_init,

	.gstrings_stats = ravb_gstrings_stats,