diff --git a/net/core/dev.c b/net/core/dev.c
index df6c0ac02a5e02d832b9adafe4ec9cd18bed45e9..372bab73b8bff9559112544b59b0a5560a012fa8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5890,11 +5890,15 @@ static int netif_receive_skb_internal(struct sk_buff *skb)
 		return NET_RX_SUCCESS;
 
 	rcu_read_lock();
-#ifdef CONFIG_RPS
 #if IS_ENABLED(CONFIG_OENETCLS)
-	if (static_branch_unlikely(&oecls_rps_needed))
-		goto oecls_rps;
+	if (static_branch_unlikely(&oecls_rps_needed)) {
+		if (oenetcls_skb_set_cpu(skb, enqueue_to_backlog, &ret)) {
+			rcu_read_unlock();
+			return ret;
+		}
+	}
 #endif
+#ifdef CONFIG_RPS
 	if (static_branch_unlikely(&rps_needed)) {
 		struct rps_dev_flow voidflow, *rflow = &voidflow;
 		int cpu = get_rps_cpu(skb->dev, skb, &rflow);
@@ -5906,15 +5910,6 @@ static int netif_receive_skb_internal(struct sk_buff *skb)
 		}
 	}
 #endif
-
-#if IS_ENABLED(CONFIG_OENETCLS)
-oecls_rps:
-	if (oenetcls_skb_set_cpu(skb, enqueue_to_backlog, &ret)) {
-		rcu_read_unlock();
-		return ret;
-	}
-#endif
-
 	ret = __netif_receive_skb(skb);
 	rcu_read_unlock();
 	return ret;
@@ -5935,11 +5930,11 @@ static void netif_receive_skb_list_internal(struct list_head *head)
 	list_splice_init(&sublist, head);
 
 	rcu_read_lock();
-#ifdef CONFIG_RPS
 #if IS_ENABLED(CONFIG_OENETCLS)
 	if (static_branch_unlikely(&oecls_rps_needed))
-		goto oecls_rps_list;
+		oenetcls_skblist_set_cpu(head, enqueue_to_backlog);
 #endif
+#ifdef CONFIG_RPS
 	if (static_branch_unlikely(&rps_needed)) {
 		list_for_each_entry_safe(skb, next, head, list) {
 			struct rps_dev_flow voidflow, *rflow = &voidflow;
@@ -5953,12 +5948,6 @@ static void netif_receive_skb_list_internal(struct list_head *head)
 		}
 	}
 #endif
-
-#if IS_ENABLED(CONFIG_OENETCLS)
-oecls_rps_list:
-	oenetcls_skblist_set_cpu(head, enqueue_to_backlog);
-#endif
-
 	__netif_receive_skb_list(head);
 	rcu_read_unlock();
 }