Commit e2c1f5c7 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: af_can: give variables holding CAN statistics a sensible name 



This patch rename the variables holding the CAN statistics (can_stats
and can_pstats) to pkg_stats and rcv_lists_stats which reflect better
their meaning.

The conversion is done with:

	sed -i \
		-e "s/can_stats\([^_]\)/pkg_stats\1/g" \
		-e "s/can_pstats/rcv_lists_stats/g" \
		net/can/af_can.c

Signed-off-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Acked-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 2341086d

net/can/af_can.c

+15 −15
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ int can_send(struct sk_buff *skb, int loop) 
{

	struct sk_buff *newskb = NULL;

	struct canfd_frame *cfd = (struct canfd_frame *)skb->data;

	struct can_pkg_stats *can_stats = dev_net(skb->dev)->can.pkg_stats;

	struct can_pkg_stats *pkg_stats = dev_net(skb->dev)->can.pkg_stats;

	int err = -EINVAL;



	if (skb->len == CAN_MTU) {
@@ -285,8 +285,8 @@ int can_send(struct sk_buff *skb, int loop) 
		netif_rx_ni(newskb);



	/* update statistics */

	can_stats->tx_frames++;

	can_stats->tx_frames_delta++;

	pkg_stats->tx_frames++;

	pkg_stats->tx_frames_delta++;



	return 0;
@@ -441,7 +441,7 @@ int can_rx_register(struct net *net, struct net_device *dev, canid_t can_id, 
	struct receiver *r;

	struct hlist_head *rl;

	struct can_dev_rcv_lists *d;

	struct can_rcv_lists_stats *can_pstats = net->can.rcv_lists_stats;

	struct can_rcv_lists_stats *rcv_lists_stats = net->can.rcv_lists_stats;

	int err = 0;



	/* insert new receiver  (dev,canid,mask) -> (func,data) */
@@ -473,9 +473,9 @@ int can_rx_register(struct net *net, struct net_device *dev, canid_t can_id, 
		hlist_add_head_rcu(&r->list, rl);

		d->entries++;



		can_pstats->rcv_entries++;

		if (can_pstats->rcv_entries_max < can_pstats->rcv_entries)

			can_pstats->rcv_entries_max = can_pstats->rcv_entries;

		rcv_lists_stats->rcv_entries++;

		if (rcv_lists_stats->rcv_entries_max < rcv_lists_stats->rcv_entries)

			rcv_lists_stats->rcv_entries_max = rcv_lists_stats->rcv_entries;

	} else {

		kmem_cache_free(rcv_cache, r);

		err = -ENODEV;
@@ -515,7 +515,7 @@ void can_rx_unregister(struct net *net, struct net_device *dev, canid_t can_id, 
{

	struct receiver *r = NULL;

	struct hlist_head *rl;

	struct can_rcv_lists_stats *can_pstats = net->can.rcv_lists_stats;

	struct can_rcv_lists_stats *rcv_lists_stats = net->can.rcv_lists_stats;

	struct can_dev_rcv_lists *d;



	if (dev && dev->type != ARPHRD_CAN)
@@ -559,8 +559,8 @@ void can_rx_unregister(struct net *net, struct net_device *dev, canid_t can_id, 
	hlist_del_rcu(&r->list);

	d->entries--;



	if (can_pstats->rcv_entries > 0)

		can_pstats->rcv_entries--;

	if (rcv_lists_stats->rcv_entries > 0)

		rcv_lists_stats->rcv_entries--;



	/* remove device structure requested by NETDEV_UNREGISTER */

	if (d->remove_on_zero_entries && !d->entries) {
@@ -655,12 +655,12 @@ static void can_receive(struct sk_buff *skb, struct net_device *dev) 
{

	struct can_dev_rcv_lists *d;

	struct net *net = dev_net(dev);

	struct can_pkg_stats *can_stats = net->can.pkg_stats;

	struct can_pkg_stats *pkg_stats = net->can.pkg_stats;

	int matches;



	/* update statistics */

	can_stats->rx_frames++;

	can_stats->rx_frames_delta++;

	pkg_stats->rx_frames++;

	pkg_stats->rx_frames_delta++;



	/* create non-zero unique skb identifier together with *skb */

	while (!(can_skb_prv(skb)->skbcnt))
@@ -682,8 +682,8 @@ static void can_receive(struct sk_buff *skb, struct net_device *dev) 
	consume_skb(skb);



	if (matches > 0) {

		can_stats->matches++;

		can_stats->matches_delta++;

		pkg_stats->matches++;

		pkg_stats->matches_delta++;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE