Skip to content

Commit 8105378

Browse files
JasonXingkuba-moo
authored andcommitted
net: rps: fix error when CONFIG_RFS_ACCEL is off
John Sperbeck reported that if we turn off CONFIG_RFS_ACCEL, the 'head' is not defined, which will trigger compile error. So I move the 'head' out of the CONFIG_RFS_ACCEL scope. Fixes: 84b6823 ("net: rps: protect last_qtail with rps_input_queue_tail_save() helper") Reported-by: John Sperbeck <jsperbeck@google.com> Closes: https://lore.kernel.org/all/20240529203421.2432481-1-jsperbeck@google.com/ Signed-off-by: Jason Xing <kernelxing@tencent.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://lore.kernel.org/r/20240530032717.57787-1-kerneljasonxing@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 166fcf8 commit 8105378

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

net/core/dev.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4516,12 +4516,13 @@ set_rps_cpu(struct net_device *dev, struct sk_buff *skb,
45164516
struct rps_dev_flow *rflow, u16 next_cpu)
45174517
{
45184518
if (next_cpu < nr_cpu_ids) {
4519+
u32 head;
45194520
#ifdef CONFIG_RFS_ACCEL
45204521
struct netdev_rx_queue *rxqueue;
45214522
struct rps_dev_flow_table *flow_table;
45224523
struct rps_dev_flow *old_rflow;
4523-
u32 flow_id, head;
45244524
u16 rxq_index;
4525+
u32 flow_id;
45254526
int rc;
45264527

45274528
/* Should we steer this flow to a different hardware queue? */

0 commit comments

Comments
 (0)