Commit 432bc230 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hsr-next' 



Murali Karicheri says:

====================
net: hsr: updates from internal tree

This series picks commit from our internal kernel tree.
Patch 1/3 fixes a file name issue introduced in my previous
series.

History:
  v2: fixed patch 3/3 by moving stats update to inside hsr_forward_skb()
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dcdecdcf ee2c46f3

net/hsr/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ obj-$(CONFIG_HSR) += hsr.o 


hsr-y			:= hsr_main.o hsr_framereg.o hsr_device.o \

			   hsr_netlink.o hsr_slave.o hsr_forward.o

hsr-$(CONFIG_DEBUG_FS) += hsr_prp_debugfs.o
 
hsr-$(CONFIG_DEBUG_FS) += hsr_debugfs.o

net/hsr/hsr_prp_debugfs.c→net/hsr/hsr_debugfs.c

+21 −22
Original line number Diff line number Diff line 
/*

 * hsr_prp_debugfs code

 * Copyright (C) 2017 Texas Instruments Incorporated

 * hsr_debugfs code

 * Copyright (C) 2019 Texas Instruments Incorporated

 *

 * Author(s):

 *	Murali Karicheri <m-karicheri2@ti.com?

 *	Murali Karicheri <m-karicheri2@ti.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as
@@ -26,9 +26,9 @@ static void print_mac_address(struct seq_file *sfp, unsigned char *mac) 
		   mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);

}



/* hsr_prp_node_table_show - Formats and prints node_table entries */

/* hsr_node_table_show - Formats and prints node_table entries */

static int

hsr_prp_node_table_show(struct seq_file *sfp, void *data)

hsr_node_table_show(struct seq_file *sfp, void *data)

{

	struct hsr_priv *priv = (struct hsr_priv *)sfp->private;

	struct hsr_node *node;
@@ -52,40 +52,40 @@ hsr_prp_node_table_show(struct seq_file *sfp, void *data) 
	return 0;

}



/* hsr_prp_node_table_open - Open the node_table file

/* hsr_node_table_open - Open the node_table file

 *

 * Description:

 * This routine opens a debugfs file node_table of specific hsr device

 */

static int

hsr_prp_node_table_open(struct inode *inode, struct file *filp)

hsr_node_table_open(struct inode *inode, struct file *filp)

{

	return single_open(filp, hsr_prp_node_table_show, inode->i_private);

	return single_open(filp, hsr_node_table_show, inode->i_private);

}



static const struct file_operations hsr_prp_fops = {

static const struct file_operations hsr_fops = {

	.owner	= THIS_MODULE,

	.open	= hsr_prp_node_table_open,

	.open	= hsr_node_table_open,

	.read	= seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};



/* hsr_prp_debugfs_init - create hsr-prp node_table file for dumping

/* hsr_debugfs_init - create hsr node_table file for dumping

 * the node table

 *

 * Description:

 * When debugfs is configured this routine sets up the node_table file per

 * hsr/prp device for dumping the node_table entries

 * hsr device for dumping the node_table entries

 */

int hsr_prp_debugfs_init(struct hsr_priv *priv)

int hsr_debugfs_init(struct hsr_priv *priv, struct net_device *hsr_dev)

{

	int rc = -1;

	struct dentry *de = NULL;



	de = debugfs_create_dir("hsr", NULL);

	de = debugfs_create_dir(hsr_dev->name, NULL);

	if (!de) {

		pr_err("Cannot create hsr-prp debugfs root\n");

		pr_err("Cannot create hsr debugfs root\n");

		return rc;

	}
@@ -93,25 +93,24 @@ int hsr_prp_debugfs_init(struct hsr_priv *priv) 


	de = debugfs_create_file("node_table", S_IFREG | 0444,

				 priv->node_tbl_root, priv,

				 &hsr_prp_fops);

				 &hsr_fops);

	if (!de) {

		pr_err("Cannot create hsr-prp node_table directory\n");

		pr_err("Cannot create hsr node_table directory\n");

		return rc;

	}

	priv->node_tbl_file = de;

	rc = 0;



	return rc;

	return 0;

}



/* hsr_prp_debugfs_term - Tear down debugfs intrastructure

/* hsr_debugfs_term - Tear down debugfs intrastructure

 *

 * Description:

 * When Debufs is configured this routine removes debugfs file system

 * elements that are specific to hsr-prp

 * elements that are specific to hsr

 */

void

hsr_prp_debugfs_term(struct hsr_priv *priv)

hsr_debugfs_term(struct hsr_priv *priv)

{

	debugfs_remove(priv->node_tbl_file);

	priv->node_tbl_file = NULL;

net/hsr/hsr_device.c

+2 −2
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static void hsr_dev_destroy(struct net_device *hsr_dev) 


	hsr = netdev_priv(hsr_dev);



	hsr_prp_debugfs_term(hsr);

	hsr_debugfs_term(hsr);



	rtnl_lock();

	hsr_for_each_port(hsr, port)
@@ -485,7 +485,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], 
		goto fail;



	mod_timer(&hsr->prune_timer, jiffies + msecs_to_jiffies(PRUNE_PERIOD));

	res = hsr_prp_debugfs_init(hsr);

	res = hsr_debugfs_init(hsr, hsr_dev);

	if (res)

		goto fail;

net/hsr/hsr_forward.c

+7 −0
Original line number Diff line number Diff line
@@ -359,6 +359,13 @@ void hsr_forward_skb(struct sk_buff *skb, struct hsr_port *port) 
		goto out_drop;

	hsr_register_frame_in(frame.node_src, port, frame.sequence_nr);

	hsr_forward_do(&frame);

	/* Gets called for ingress frames as well as egress from master port.

	 * So check and increment stats for master port only here.

	 */

	if (port->type == HSR_PT_MASTER) {

		port->dev->stats.tx_packets++;

		port->dev->stats.tx_bytes += skb->len;

	}



	if (frame.skb_hsr)

		kfree_skb(frame.skb_hsr);

net/hsr/hsr_main.h

+5 −4
Original line number Diff line number Diff line
@@ -184,15 +184,16 @@ static inline u16 hsr_get_skb_sequence_nr(struct sk_buff *skb) 
}



#if IS_ENABLED(CONFIG_DEBUG_FS)

int hsr_prp_debugfs_init(struct hsr_priv *priv);

void hsr_prp_debugfs_term(struct hsr_priv *priv);

int hsr_debugfs_init(struct hsr_priv *priv, struct net_device *hsr_dev);

void hsr_debugfs_term(struct hsr_priv *priv);

#else

static inline int hsr_prp_debugfs_init(struct hsr_priv *priv)

static inline int hsr_debugfs_init(struct hsr_priv *priv,

				   struct net_device *hsr_dev)

{

	return 0;

}



static inline void hsr_prp_debugfs_term(struct hsr_priv *priv)

static inline void hsr_debugfs_term(struct hsr_priv *priv)

{}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE