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

Commit 8960b389 authored by Tal Gilboa's avatar Tal Gilboa Committed by Saeed Mahameed
Browse files

linux/dim: Rename externally used net_dim members 



Removed 'net' prefix from functions and structs used by external drivers.

Signed-off-by: default avatarTal Gilboa <talgi@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent e5b6ab02

drivers/net/ethernet/broadcom/bcmsysport.c

+8 −8
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ static int bcm_sysport_set_coalesce(struct net_device *dev, 
				    struct ethtool_coalesce *ec)

{

	struct bcm_sysport_priv *priv = netdev_priv(dev);

	struct net_dim_cq_moder moder;

	struct dim_cq_moder moder;

	u32 usecs, pkts;

	unsigned int i;
@@ -995,7 +995,7 @@ static int bcm_sysport_poll(struct napi_struct *napi, int budget) 
{

	struct bcm_sysport_priv *priv =

		container_of(napi, struct bcm_sysport_priv, napi);

	struct net_dim_sample dim_sample;

	struct dim_sample dim_sample;

	unsigned int work_done = 0;



	work_done = bcm_sysport_desc_rx(priv, budget);
@@ -1019,7 +1019,7 @@ static int bcm_sysport_poll(struct napi_struct *napi, int budget) 
	}



	if (priv->dim.use_dim) {

		net_dim_update_sample(priv->dim.event_ctr, priv->dim.packets,

		dim_update_sample(priv->dim.event_ctr, priv->dim.packets,

				  priv->dim.bytes, &dim_sample);

		net_dim(&priv->dim.dim, dim_sample);

	}
@@ -1090,13 +1090,13 @@ static void bcm_sysport_resume_from_wol(struct bcm_sysport_priv *priv) 


static void bcm_sysport_dim_work(struct work_struct *work)

{

	struct net_dim *dim = container_of(work, struct net_dim, work);

	struct dim *dim = container_of(work, struct dim, work);

	struct bcm_sysport_net_dim *ndim =

			container_of(dim, struct bcm_sysport_net_dim, dim);

	struct bcm_sysport_priv *priv =

			container_of(ndim, struct bcm_sysport_priv, dim);

	struct net_dim_cq_moder cur_profile =

			net_dim_get_rx_moderation(dim->mode, dim->profile_ix);

	struct dim_cq_moder cur_profile = net_dim_get_rx_moderation(dim->mode,

								    dim->profile_ix);



	bcm_sysport_set_rx_coalesce(priv, cur_profile.usec, cur_profile.pkts);

	dim->state = DIM_START_MEASURE;
@@ -1449,7 +1449,7 @@ static void bcm_sysport_init_dim(struct bcm_sysport_priv *priv, 
static void bcm_sysport_init_rx_coalesce(struct bcm_sysport_priv *priv)

{

	struct bcm_sysport_net_dim *dim = &priv->dim;

	struct net_dim_cq_moder moder;

	struct dim_cq_moder moder;

	u32 usecs, pkts;



	usecs = priv->rx_coalesce_usecs;

drivers/net/ethernet/broadcom/bcmsysport.h

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ struct bcm_sysport_net_dim { 
	u16			event_ctr;

	unsigned long		packets;

	unsigned long		bytes;

	struct net_dim		dim;

	struct dim		dim;

};



/* Software view of the TX ring */

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+5 −5
Original line number Diff line number Diff line
@@ -2128,9 +2128,9 @@ static int bnxt_poll(struct napi_struct *napi, int budget) 
		}

	}

	if (bp->flags & BNXT_FLAG_DIM) {

		struct net_dim_sample dim_sample;

		struct dim_sample dim_sample;



		net_dim_update_sample(cpr->event_ctr,

		dim_update_sample(cpr->event_ctr,

				  cpr->rx_packets,

				  cpr->rx_bytes,

				  &dim_sample);

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ struct bnxt_cp_ring_info { 
	u64			rx_bytes;

	u64			event_ctr;



	struct net_dim		dim;

	struct dim		dim;



	union {

		struct tx_cmp	*cp_desc_ring[MAX_CP_PAGES];

drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static ssize_t debugfs_dim_read(struct file *filep, 
				char __user *buffer,

				size_t count, loff_t *ppos)

{

	struct net_dim *dim = filep->private_data;

	struct dim *dim = filep->private_data;

	int len;

	char *buf;
@@ -61,7 +61,7 @@ static const struct file_operations debugfs_dim_fops = { 
	.read = debugfs_dim_read,

};



static struct dentry *debugfs_dim_ring_init(struct net_dim *dim, int ring_idx,

static struct dentry *debugfs_dim_ring_init(struct dim *dim, int ring_idx,

					    struct dentry *dd)

{

	static char qname[16];