diff options
| author | Vlad Yasevich <vyasevich@gmail.com> | 2014-10-03 11:29:18 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-05 21:21:37 -0400 |
| commit | 5be5a2df40f005ea7fb7e280e87bbbcfcf1c2fc0 (patch) | |
| tree | 6aa782488f47684f803657acca74aa42b1303e59 /net/bridge/br_device.c | |
| parent | 3df6bf45ec008942f16f1814123c4bdebcf50741 (diff) | |
| download | linux-stable-5be5a2df40f005ea7fb7e280e87bbbcfcf1c2fc0.tar.gz linux-stable-5be5a2df40f005ea7fb7e280e87bbbcfcf1c2fc0.tar.bz2 linux-stable-5be5a2df40f005ea7fb7e280e87bbbcfcf1c2fc0.zip | |
bridge: Add filtering support for default_pvid
Currently when vlan filtering is turned on on the bridge, the bridge
will drop all traffic untill the user configures the filter. This
isn't very nice for ports that don't care about vlans and just
want untagged traffic.
A concept of a default_pvid was recently introduced. This patch
adds filtering support for default_pvid. Now, ports that don't
care about vlans and don't define there own filter will belong
to the VLAN of the default_pvid and continue to receive untagged
traffic.
This filtering can be disabled by setting default_pvid to 0.
Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_device.c')
| -rw-r--r-- | net/bridge/br_device.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 659cac15c0df..ffd379db5938 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -88,12 +88,17 @@ out: static int br_dev_init(struct net_device *dev) { struct net_bridge *br = netdev_priv(dev); + int err; br->stats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); if (!br->stats) return -ENOMEM; - return 0; + err = br_vlan_init(br); + if (err) + free_percpu(br->stats); + + return err; } static int br_dev_open(struct net_device *dev) @@ -389,5 +394,4 @@ void br_dev_setup(struct net_device *dev) br_netfilter_rtable_init(br); br_stp_timer_init(br); br_multicast_init(br); - br_vlan_init(br); } |