diff options
| author |   Vlad Yasevich <vyasevic@redhat.com> | 2013-02-13 12:00:14 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-02-13 19:42:15 -0500 |
| commit | 7885198861fc9a3dfdc6bb90dc0ba12689d6cd57 (patch) | |
| tree | a75ed0f9b3fe72be08dcb13216c87f4f8e37bb75 /net/bridge/br_forward.c | |
| parent | bridge: Dump vlan information from a bridge port (diff) | |
| download | linux-dev-7885198861fc9a3dfdc6bb90dc0ba12689d6cd57.tar.xz linux-dev-7885198861fc9a3dfdc6bb90dc0ba12689d6cd57.zip | |
bridge: Implement vlan ingress/egress policy with PVID.
At ingress, any untagged traffic is assigned to the PVID.
Any tagged traffic is filtered according to membership bitmap.
At egress, if the vlan matches the PVID, the frame is sent
untagged. Otherwise the frame is sent tagged.
Signed-off-by: Vlad Yasevich <vyasevic@redhat.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.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index 35b0671f135d..092b20e4ee4c 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -64,6 +64,10 @@ int br_forward_finish(struct sk_buff *skb) static void __br_deliver(const struct net_bridge_port *to, struct sk_buff *skb) { + skb = br_handle_vlan(to->br, nbp_get_vlan_info(to), skb); + if (!skb) + return; + skb->dev = to->dev; if (unlikely(netpoll_tx_running(to->br->dev))) { @@ -89,6 +93,10 @@ static void __br_forward(const struct net_bridge_port *to, struct sk_buff *skb) return; } + skb = br_handle_vlan(to->br, nbp_get_vlan_info(to), skb); + if (!skb) + return; + indev = skb->dev; skb->dev = to->dev; skb_forward_csum(skb); |