diff options
| author |   Felix Fietkau <nbd@nbd.name> | 2021-03-24 02:30:35 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-03-24 12:48:38 -0700 |
| commit | bcf2766b1377421b7c9259865b25c1b62a7fa686 (patch) | |
| tree | bce4153c39a9dabf1c7d562db02a2f77787b058f /net/8021q/vlan_dev.c | |
| parent | net: bridge: resolve forwarding path for bridge devices (diff) | |
| download | linux-dev-bcf2766b1377421b7c9259865b25c1b62a7fa686.tar.xz linux-dev-bcf2766b1377421b7c9259865b25c1b62a7fa686.zip | |
net: bridge: resolve forwarding path for VLAN tag actions in bridge devices
Depending on the VLAN settings of the bridge and the port, the bridge can
either add or remove a tag. When vlan filtering is enabled, the fdb lookup
also needs to know the VLAN tag/proto for the destination address
To provide this, keep track of the stack of VLAN tags for the path in the
lookup context
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 1b1955a63f7f..4db3f0621959 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -786,6 +786,12 @@ static int vlan_dev_fill_forward_path(struct net_device_path_ctx *ctx, path->encap.proto = vlan->vlan_proto; path->dev = ctx->dev; ctx->dev = vlan->real_dev; + if (ctx->num_vlans >= ARRAY_SIZE(ctx->vlan)) + return -ENOSPC; + + ctx->vlan[ctx->num_vlans].id = vlan->vlan_id; + ctx->vlan[ctx->num_vlans].proto = vlan->vlan_proto; + ctx->num_vlans++; return 0; } |