From: Zhang Changzhong <zhangchangzhong@huawei.com>
Date: Sat, 24 Aug 2024 08:26:43 +0000 (+0800)
Subject: wifi: mac80211: remove redundant unlikely() around IS_ERR()
X-Git-Tag: v6.12-rc1~232^2~101^2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0ee9dcce60027258a53ee85b9153ab268dcb55a;p=thirdparty%2Fkernel%2Flinux.git

wifi: mac80211: remove redundant unlikely() around IS_ERR()

IS_ERR() already calls unlikely(), so unlikely() is redundant here.

Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Link: https://patch.msgid.link/1724488003-45388-1-git-send-email-zhangchangzhong@huawei.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index c0a5c75cddcb9..30c0d89203aff 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;
 	}