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

Commit 1aee6cc2 authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

net/hsr: using kfree_rcu() to simplify the code 



The callback function of call_rcu() just calls a kfree(), so we
can use kfree_rcu() instead of call_rcu() + callback function.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: default avatarArvid Brodin <arvid.brodin@alten.se>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7271174f

net/hsr/hsr_framereg.c

+4 −9
Original line number Diff line number Diff line
@@ -127,11 +127,6 @@ int hsr_create_self_node(struct list_head *self_node_db, 
	return 0;

}



static void node_entry_reclaim(struct rcu_head *rh)

{

	kfree(container_of(rh, struct node_entry, rcu_head));

}





/* Add/merge node to the database of nodes. 'skb' must contain an HSR

 * supervision frame.
@@ -175,7 +170,7 @@ struct node_entry *hsr_merge_node(struct hsr_priv *hsr_priv, 
	if (node && !ether_addr_equal(node->MacAddressA, hsr_sp->MacAddressA)) {

		/* Node has changed its AddrA, frame was received from SlaveB */

		list_del_rcu(&node->mac_list);

		call_rcu(&node->rcu_head, node_entry_reclaim);

		kfree_rcu(node, rcu_head);

		node = NULL;

	}
@@ -183,7 +178,7 @@ struct node_entry *hsr_merge_node(struct hsr_priv *hsr_priv, 
	    !ether_addr_equal(node->MacAddressB, hsr_ethsup->ethhdr.h_source)) {

		/* Cables have been swapped */

		list_del_rcu(&node->mac_list);

		call_rcu(&node->rcu_head, node_entry_reclaim);

		kfree_rcu(node, rcu_head);

		node = NULL;

	}
@@ -192,7 +187,7 @@ struct node_entry *hsr_merge_node(struct hsr_priv *hsr_priv, 
	    !ether_addr_equal(node->MacAddressA, hsr_ethsup->ethhdr.h_source)) {

		/* Cables have been swapped */

		list_del_rcu(&node->mac_list);

		call_rcu(&node->rcu_head, node_entry_reclaim);

		kfree_rcu(node, rcu_head);

		node = NULL;

	}
@@ -417,7 +412,7 @@ void hsr_prune_nodes(struct hsr_priv *hsr_priv) 
			hsr_nl_nodedown(hsr_priv, node->MacAddressA);

			list_del_rcu(&node->mac_list);

			/* Note that we need to free this entry later: */

			call_rcu(&node->rcu_head, node_entry_reclaim);

			kfree_rcu(node, rcu_head);

		}

	}

	rcu_read_unlock();