diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-18 11:08:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-18 11:08:01 +0200 |
| commit | bf14c18a2cbf65687c59a11f5e4824c4a0c8182b (patch) | |
| tree | 5bc354498da520c44ebefa8fbe970b0404838553 /net/core/dev.c | |
| parent | ffd8e8bd26e945a957e827427e8cbe8fa8e23d0d (diff) | |
| parent | 6ba59ff4227927d3a8530fc2973b80e94b54d58f (diff) | |
Merge tag 'v6.10-rc4' into tty-next
We need the tty/serial fixes in here as well
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index e1bb6d7856d9..4d4de9008f6f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4516,12 +4516,13 @@ set_rps_cpu(struct net_device *dev, struct sk_buff *skb, struct rps_dev_flow *rflow, u16 next_cpu) { if (next_cpu < nr_cpu_ids) { + u32 head; #ifdef CONFIG_RFS_ACCEL struct netdev_rx_queue *rxqueue; struct rps_dev_flow_table *flow_table; struct rps_dev_flow *old_rflow; - u32 flow_id, head; u16 rxq_index; + u32 flow_id; int rc; /* Should we steer this flow to a different hardware queue? */ |