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

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

can: af_can: give struct holding the CAN per device receive lists a sensible name 



This patch adds a "can_" prefix to the "struct dev_rcv_lists" to better
reflect the meaning and improbe code readability.

The conversion is done with:

	sed -i \
		-e "s/struct dev_rcv_lists/struct can_dev_rcv_lists/g" \
		net/can/*.[ch] include/net/netns/can.h

Acked-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent adb552c3

include/net/netns/can.h

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include <linux/spinlock.h>



struct dev_rcv_lists;

struct can_dev_rcv_lists;

struct s_stats;

struct s_pstats;
@@ -28,7 +28,7 @@ struct netns_can { 
#endif



	/* receive filters subscribed for 'all' CAN devices */

	struct dev_rcv_lists *can_rx_alldev_list;

	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 */

net/can/af_can.c

+10 −10
Original line number Diff line number Diff line
@@ -321,13 +321,13 @@ EXPORT_SYMBOL(can_send); 
 * af_can rx path

 */



static struct dev_rcv_lists *find_dev_rcv_lists(struct net *net,

static struct can_dev_rcv_lists *find_dev_rcv_lists(struct net *net,

						struct net_device *dev)

{

	if (!dev)

		return net->can.can_rx_alldev_list;

	else

		return (struct dev_rcv_lists *)dev->ml_priv;

		return (struct can_dev_rcv_lists *)dev->ml_priv;

}



/**
@@ -381,7 +381,7 @@ static unsigned int effhash(canid_t can_id) 
 *  Reduced can_id to have a preprocessed filter compare value.

 */

static struct hlist_head *find_rcv_list(canid_t *can_id, canid_t *mask,

					struct dev_rcv_lists *d)

					struct can_dev_rcv_lists *d)

{

	canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking */
@@ -464,7 +464,7 @@ int can_rx_register(struct net *net, struct net_device *dev, canid_t can_id, 
{

	struct receiver *r;

	struct hlist_head *rl;

	struct dev_rcv_lists *d;

	struct can_dev_rcv_lists *d;

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

	int err = 0;
@@ -542,7 +542,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 dev_rcv_lists *d;

	struct can_dev_rcv_lists *d;



	if (dev && dev->type != ARPHRD_CAN)

		return;
@@ -615,7 +615,7 @@ static inline void deliver(struct sk_buff *skb, struct receiver *r) 
	r->matches++;

}



static int can_rcv_filter(struct dev_rcv_lists *d, struct sk_buff *skb)

static int can_rcv_filter(struct can_dev_rcv_lists *d, struct sk_buff *skb)

{

	struct receiver *r;

	int matches = 0;
@@ -682,7 +682,7 @@ static int can_rcv_filter(struct dev_rcv_lists *d, struct sk_buff *skb) 


static void can_receive(struct sk_buff *skb, struct net_device *dev)

{

	struct dev_rcv_lists *d;

	struct can_dev_rcv_lists *d;

	struct net *net = dev_net(dev);

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

	int matches;
@@ -829,7 +829,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg, 
			void *ptr)

{

	struct net_device *dev = netdev_notifier_info_to_dev(ptr);

	struct dev_rcv_lists *d;

	struct can_dev_rcv_lists *d;



	if (dev->type != ARPHRD_CAN)

		return NOTIFY_DONE;
@@ -874,7 +874,7 @@ static int can_pernet_init(struct net *net) 
{

	spin_lock_init(&net->can.can_rcvlists_lock);

	net->can.can_rx_alldev_list =

		kzalloc(sizeof(struct dev_rcv_lists), GFP_KERNEL);

		kzalloc(sizeof(struct can_dev_rcv_lists), GFP_KERNEL);

	if (!net->can.can_rx_alldev_list)

		goto out;

	net->can.can_stats = kzalloc(sizeof(struct s_stats), GFP_KERNEL);
@@ -920,7 +920,7 @@ static void can_pernet_exit(struct net *net) 
	rcu_read_lock();

	for_each_netdev_rcu(net, dev) {

		if (dev->type == ARPHRD_CAN && dev->ml_priv) {

			struct dev_rcv_lists *d = dev->ml_priv;

			struct can_dev_rcv_lists *d = dev->ml_priv;



			BUG_ON(d->entries);

			kfree(d);

net/can/af_can.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct receiver { 
enum { RX_ERR, RX_ALL, RX_FIL, RX_INV, RX_MAX };



/* per device receive filters linked at dev->ml_priv */

struct dev_rcv_lists {

struct can_dev_rcv_lists {

	struct hlist_head rx[RX_MAX];

	struct hlist_head rx_sff[CAN_SFF_RCV_ARRAY_SZ];

	struct hlist_head rx_eff[CAN_EFF_RCV_ARRAY_SZ];

net/can/proc.c

+4 −4
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static const struct file_operations can_version_proc_fops = { 


static inline void can_rcvlist_proc_show_one(struct seq_file *m, int idx,

					     struct net_device *dev,

					     struct dev_rcv_lists *d)

					     struct can_dev_rcv_lists *d)

{

	if (!hlist_empty(&d->rx[idx])) {

		can_print_recv_banner(m);
@@ -353,7 +353,7 @@ static int can_rcvlist_proc_show(struct seq_file *m, void *v) 
	/* double cast to prevent GCC warning */

	int idx = (int)(long)PDE_DATA(m->file->f_inode);

	struct net_device *dev;

	struct dev_rcv_lists *d;

	struct can_dev_rcv_lists *d;

	struct net *net = m->private;



	seq_printf(m, "\nreceive list '%s':\n", rx_list_name[idx]);
@@ -417,7 +417,7 @@ static inline void can_rcvlist_proc_show_array(struct seq_file *m, 
static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v)

{

	struct net_device *dev;

	struct dev_rcv_lists *d;

	struct can_dev_rcv_lists *d;

	struct net *net = m->private;



	/* RX_SFF */
@@ -461,7 +461,7 @@ static const struct file_operations can_rcvlist_sff_proc_fops = { 
static int can_rcvlist_eff_proc_show(struct seq_file *m, void *v)

{

	struct net_device *dev;

	struct dev_rcv_lists *d;

	struct can_dev_rcv_lists *d;

	struct net *net = m->private;



	/* RX_EFF */