f07fe36f22
Move patches to backport-5.10, since the series was accepted upstream Signed-off-by: Felix Fietkau <nbd@nbd.name>
33 lines
960 B
Diff
33 lines
960 B
Diff
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Date: Wed, 24 Mar 2021 02:30:44 +0100
|
|
Subject: [PATCH] netfilter: flowtable: add dsa support
|
|
|
|
Replace the master ethernet device by the dsa slave port. Packets coming
|
|
in from the software ingress path use the dsa slave port as input
|
|
device.
|
|
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
---
|
|
|
|
--- a/net/netfilter/nft_flow_offload.c
|
|
+++ b/net/netfilter/nft_flow_offload.c
|
|
@@ -89,6 +89,7 @@ static void nft_dev_path_info(const stru
|
|
path = &stack->path[i];
|
|
switch (path->type) {
|
|
case DEV_PATH_ETHERNET:
|
|
+ case DEV_PATH_DSA:
|
|
case DEV_PATH_VLAN:
|
|
case DEV_PATH_PPPOE:
|
|
info->indev = path->dev;
|
|
@@ -97,6 +98,10 @@ static void nft_dev_path_info(const stru
|
|
|
|
if (path->type == DEV_PATH_ETHERNET)
|
|
break;
|
|
+ if (path->type == DEV_PATH_DSA) {
|
|
+ i = stack->num_paths;
|
|
+ break;
|
|
+ }
|
|
|
|
/* DEV_PATH_VLAN and DEV_PATH_PPPOE */
|
|
if (info->num_encaps >= NF_FLOW_TABLE_ENCAP_MAX) {
|