summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_forward.c
diff options
context:
space:
mode:
authorRoopa Prabhu <roopa@cumulusnetworks.com>2017-01-31 22:59:55 -0800
committerDavid S. Miller <davem@davemloft.net>2017-02-03 15:21:22 -0500
commit11538d039ac6efcf4f1a6c536e1b87cd3668a9fd (patch)
tree48288a17219c037942267db3c6c469cf47bf7ecb /net/bridge/br_forward.c
parentefa5356b0d9753b9d7e63e41459eba106cce30f3 (diff)
downloadlinux-11538d039ac6efcf4f1a6c536e1b87cd3668a9fd.tar.gz
linux-11538d039ac6efcf4f1a6c536e1b87cd3668a9fd.tar.bz2
linux-11538d039ac6efcf4f1a6c536e1b87cd3668a9fd.zip
bridge: vlan dst_metadata hooks in ingress and egress paths
- ingress hook: - if port is a tunnel port, use tunnel info in attached dst_metadata to map it to a local vlan - egress hook: - if port is a tunnel port, use tunnel info attached to vlan to set dst_metadata on the skb CC: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_forward.c')
-rw-r--r--net/bridge/br_forward.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 5a1f8ef49899..6bfac29318f2 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -80,7 +80,7 @@ static void __br_forward(const struct net_bridge_port *to,
int br_hook;
vg = nbp_vlan_group_rcu(to);
- skb = br_handle_vlan(to->br, vg, skb);
+ skb = br_handle_vlan(to->br, to, vg, skb);
if (!skb)
return;