From: Marc Kleine-Budde mkl@pengutronix.de
mainline inclusion from mainline-v5.4-rc1 commit 3ee6d2bebef8cd35d2a43422b642f7b57fb409f9 category: feature bugzilla: 38684 CVE: NA
---------------------------
This patch add the commonly used prefix "can_" to the find_rcv_list() function and add the "find" to the end, as the function returns a struct rcv_list. This improves the overall readability of the code.
Signed-off-by: Oleksij Rempel o.rempel@pengutronix.de Acked-by: Oliver Hartkopp socketcan@hartkopp.net Signed-off-by: Marc Kleine-Budde mkl@pengutronix.de
Conflicts: net/can/af_can.c
Signed-off-by: Zhang Changzhong zhangchangzhong@huawei.com Reviewed-by: YueHaibing yuehaibing@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- net/can/af_can.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/can/af_can.c b/net/can/af_can.c index df017035aaa8..a87ce39724ad 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -356,7 +356,7 @@ static unsigned int effhash(canid_t can_id) }
/** - * find_rcv_list - determine optimal filterlist inside device filter struct + * can_rcv_list_find - determine optimal filterlist inside device filter struct * @can_id: pointer to CAN identifier of a given can_filter * @mask: pointer to CAN mask of a given can_filter * @d: pointer to the device filter struct @@ -382,8 +382,8 @@ static unsigned int effhash(canid_t can_id) * Constistency checked mask. * 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 can_dev_rcv_lists *dev_rcv_lists) +static struct hlist_head *can_rcv_list_find(canid_t *can_id, canid_t *mask, + struct can_dev_rcv_lists *dev_rcv_lists) { canid_t inv = *can_id & CAN_INV_FILTER; /* save flag before masking */
@@ -486,7 +486,7 @@ int can_rx_register(struct net *net, struct net_device *dev, canid_t can_id,
dev_rcv_lists = find_dev_rcv_lists(net, dev); if (dev_rcv_lists) { - rl = find_rcv_list(&can_id, &mask, dev_rcv_lists); + rl = can_rcv_list_find(&can_id, &mask, dev_rcv_lists);
r->can_id = can_id; r->mask = mask; @@ -562,7 +562,7 @@ void can_rx_unregister(struct net *net, struct net_device *dev, canid_t can_id, goto out; }
- rl = find_rcv_list(&can_id, &mask, dev_rcv_lists); + rl = can_rcv_list_find(&can_id, &mask, dev_rcv_lists);
/* * Search the receiver list for the item to delete. This should