diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-09-30 20:16:53 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-01 18:24:04 -0700 |
| commit | 77751ee8aec3e1748e0d1471ccbfc008793e88a6 (patch) | |
| tree | 65776b5154f1e6222c0fea5436cf123a5132be8b /net/bridge/br_input.c | |
| parent | bridge: vlan: fix possible null vlgrp deref while registering new port (diff) | |
| download | linux-dev-77751ee8aec3e1748e0d1471ccbfc008793e88a6.tar.xz linux-dev-77751ee8aec3e1748e0d1471ccbfc008793e88a6.zip | |
bridge: vlan: move pvid inside net_bridge_vlan_group
One obvious way to converge more code (which was also used by the
previous vlan code) is to move pvid inside net_bridge_vlan_group. This
allows us to simplify some and remove other port-specific functions.
Also gives us the ability to simply pass the vlan group and use all of the
contained information.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_input.c')
| -rw-r--r-- | net/bridge/br_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index e27d0dfd2ee9..f5c5a4500e2f 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -140,7 +140,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb if (!p || p->state == BR_STATE_DISABLED) goto drop; - if (!nbp_allowed_ingress(p, skb, &vid)) + if (!br_allowed_ingress(p->br, nbp_vlan_group(p), skb, &vid)) goto out; /* insert into forwarding database after filtering to avoid spoofing */ |