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

can: netns: give structs holding the CAN statistics a sensible name 



This patch renames both "struct s_stats" and "struct s_pstats", to
"struct can_pkg_stats" and "struct can_rcv_lists_stats" to better
reflect their meaning and improve code readability.

The conversion is done with:

	sed -i \
		-e "s/struct s_stats/struct can_pkg_stats/g" \
		-e "s/struct s_pstats/struct can_rcv_lists_stats/g" \
		net/can/*.[ch] \
		include/net/netns/can.h

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 2c1f9e26

include/net/netns/can.h

+4 −4
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
#include <linux/spinlock.h>



struct can_dev_rcv_lists;

struct s_stats;

struct s_pstats;

struct can_pkg_stats;

struct can_rcv_lists_stats;



struct netns_can {

#if IS_ENABLED(CONFIG_PROC_FS)
@@ -31,8 +31,8 @@ struct netns_can { 
	struct can_dev_rcv_lists *can_rx_alldev_list;

	spinlock_t can_rcvlists_lock;

	struct timer_list can_stattimer;/* timer for statistics update */

	struct s_stats *can_stats;	/* packet statistics */

	struct s_pstats *can_pstats;	/* receive list statistics */

	struct can_pkg_stats *can_stats;	/* packet statistics */

	struct can_rcv_lists_stats *can_pstats;	/* receive list statistics */



	/* CAN GW per-net gateway jobs */

	struct hlist_head cgw_list;

net/can/af_can.c

+4 −4
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 s_stats *can_stats = dev_net(skb->dev)->can.can_stats;

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

	int err = -EINVAL;



	if (skb->len == CAN_MTU) {
@@ -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 s_pstats *can_pstats = net->can.can_pstats;

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

	int err = 0;



	/* insert new receiver  (dev,canid,mask) -> (func,data) */
@@ -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 s_pstats *can_pstats = net->can.can_pstats;

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

	struct can_dev_rcv_lists *d;



	if (dev && dev->type != ARPHRD_CAN)
@@ -655,7 +655,7 @@ 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 s_stats *can_stats = net->can.can_stats;

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

	int matches;



	/* update statistics */

net/can/af_can.h

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct can_dev_rcv_lists { 
/* statistic structures */



/* can be reset e.g. by can_init_stats() */

struct s_stats {

struct can_pkg_stats {

	unsigned long jiffies_init;



	unsigned long rx_frames;
@@ -103,7 +103,7 @@ struct s_stats { 
};



/* persistent statistics */

struct s_pstats {

struct can_rcv_lists_stats {

	unsigned long stats_reset;

	unsigned long user_reset;

	unsigned long rcv_entries;

net/can/proc.c

+8 −8
Original line number Diff line number Diff line
@@ -78,14 +78,14 @@ static const char rx_list_name[][8] = { 


static void can_init_stats(struct net *net)

{

	struct s_stats *can_stats = net->can.can_stats;

	struct s_pstats *can_pstats = net->can.can_pstats;

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

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

	/*

	 * This memset function is called from a timer context (when

	 * can_stattimer is active which is the default) OR in a process

	 * context (reading the proc_fs when can_stattimer is disabled).

	 */

	memset(can_stats, 0, sizeof(struct s_stats));

	memset(can_stats, 0, sizeof(struct can_pkg_stats));

	can_stats->jiffies_init = jiffies;



	can_pstats->stats_reset++;
@@ -119,7 +119,7 @@ static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif, 
void can_stat_update(struct timer_list *t)

{

	struct net *net = from_timer(net, t, can.can_stattimer);

	struct s_stats *can_stats = net->can.can_stats;

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

	unsigned long j = jiffies; /* snapshot */



	/* restart counting in timer context on user request */
@@ -212,8 +212,8 @@ static void can_print_recv_banner(struct seq_file *m) 
static int can_stats_proc_show(struct seq_file *m, void *v)

{

	struct net *net = m->private;

	struct s_stats *can_stats = net->can.can_stats;

	struct s_pstats *can_pstats = net->can.can_pstats;

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

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



	seq_putc(m, '\n');

	seq_printf(m, " %8ld transmitted frames (TXF)\n", can_stats->tx_frames);
@@ -274,8 +274,8 @@ static int can_stats_proc_show(struct seq_file *m, void *v) 
static int can_reset_stats_proc_show(struct seq_file *m, void *v)

{

	struct net *net = m->private;

	struct s_pstats *can_pstats = net->can.can_pstats;

	struct s_stats *can_stats = net->can.can_stats;

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

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



	user_reset = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE