aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Chapman <[email protected]>2024-09-03 12:35:47 +0100
committerJakub Kicinski <[email protected]>2024-09-04 16:39:32 -0700
commit510c0732fc8cabe7bca8de291c74d3f3cc36df48 (patch)
tree8388d52b5eb7280b7f68839c7be58483013caa61
parent1705341485ff1eec097dfa26891d03afe5907e16 (diff)
l2tp: remove unneeded null check in l2tp_v2_session_get_next
Commit aa92c1cec92b ("l2tp: add tunnel/session get_next helpers") uses idr_get_next APIs to iterate over l2tp session IDR lists. Sessions in l2tp_v2_session_idr always have a non-null session->tunnel pointer since l2tp_session_register sets it before inserting the session into the IDR. Therefore the null check on session->tunnel in l2tp_v2_session_get_next is redundant and can be removed. Removing the check avoids a warning from lkp. Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/r/[email protected]/ CC: Dan Carpenter <[email protected]> Signed-off-by: James Chapman <[email protected]> Acked-by: Tom Parkin <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
-rw-r--r--net/l2tp/l2tp_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 32102d1ed4cd..3eec23ac5ab1 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -345,7 +345,7 @@ again:
goto again;
}
- if (tunnel && tunnel->tunnel_id == tid &&
+ if (tunnel->tunnel_id == tid &&
refcount_inc_not_zero(&session->ref_count)) {
rcu_read_unlock_bh();
return session;