diff mbox series

[-next] mac80211: remove redundant unlikely() around IS_ERR()

Message ID 1724380658-25139-1-git-send-email-zhangchangzhong@huawei.com (mailing list archive)
State Superseded
Delegated to: Johannes Berg
Headers show
Series [-next] mac80211: remove redundant unlikely() around IS_ERR() | expand

Commit Message

Zhang Changzhong Aug. 23, 2024, 2:37 a.m. UTC
IS_ERR() already calls unlikely(), so unlikely() is redundant here.

Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
---
 net/mac80211/mesh_pathtbl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kalle Valo Aug. 23, 2024, 9:02 a.m. UTC | #1
Zhang Changzhong <zhangchangzhong@huawei.com> writes:

> IS_ERR() already calls unlikely(), so unlikely() is redundant here.
>
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

"wifi:" missing in the title.
diff mbox series

Patch

diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index c0a5c75..30c0d89 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -580,7 +580,7 @@  void mesh_fast_tx_cache(struct ieee80211_sub_if_data *sdata,
 	prev = rhashtable_lookup_get_insert_fast(&cache->rht,
 						 &entry->rhash,
 						 fast_tx_rht_params);
-	if (unlikely(IS_ERR(prev))) {
+	if (IS_ERR(prev)) {
 		kfree(entry);
 		goto unlock_cache;
 	}