blob: 283d012c3d89085c62f0e43d80a67d150f971930 [file] [log] [blame]
Vlad Yasevich243a2e62013-02-13 12:00:09 +00001#include <linux/kernel.h>
2#include <linux/netdevice.h>
3#include <linux/rtnetlink.h>
4#include <linux/slab.h>
Scott Feldman7f109532015-06-12 17:39:50 -07005#include <net/switchdev.h>
Vlad Yasevich243a2e62013-02-13 12:00:09 +00006
7#include "br_private.h"
8
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +02009static inline int br_vlan_cmp(struct rhashtable_compare_arg *arg,
10 const void *ptr)
Vlad Yasevich552406c2013-02-13 12:00:15 +000011{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +020012 const struct net_bridge_vlan *vle = ptr;
13 u16 vid = *(u16 *)arg->key;
14
15 return vle->vid != vid;
16}
17
18static const struct rhashtable_params br_vlan_rht_params = {
19 .head_offset = offsetof(struct net_bridge_vlan, vnode),
20 .key_offset = offsetof(struct net_bridge_vlan, vid),
21 .key_len = sizeof(u16),
Nikolay Aleksandrov8af78b62015-09-30 20:16:51 +020022 .nelem_hint = 3,
23 .locks_mul = 1,
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +020024 .max_size = VLAN_N_VID,
25 .obj_cmpfn = br_vlan_cmp,
26 .automatic_shrinking = true,
27};
28
29static struct net_bridge_vlan *br_vlan_lookup(struct rhashtable *tbl, u16 vid)
30{
31 return rhashtable_lookup_fast(tbl, &vid, br_vlan_rht_params);
32}
33
34static void __vlan_add_pvid(u16 *pvid, u16 vid)
35{
36 if (*pvid == vid)
Vlad Yasevich552406c2013-02-13 12:00:15 +000037 return;
38
39 smp_wmb();
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +020040 *pvid = vid;
Vlad Yasevich552406c2013-02-13 12:00:15 +000041}
42
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +020043static void __vlan_delete_pvid(u16 *pvid, u16 vid)
Vlad Yasevich552406c2013-02-13 12:00:15 +000044{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +020045 if (*pvid != vid)
Vlad Yasevich552406c2013-02-13 12:00:15 +000046 return;
47
48 smp_wmb();
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +020049 *pvid = 0;
Vlad Yasevich552406c2013-02-13 12:00:15 +000050}
51
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +020052static void __vlan_add_flags(struct net_bridge_vlan *v, u16 flags)
Vlad Yasevich35e03f32013-02-13 12:00:20 +000053{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +020054 if (flags & BRIDGE_VLAN_INFO_PVID) {
55 if (br_vlan_is_master(v))
56 __vlan_add_pvid(&v->br->pvid, v->vid);
57 else
58 __vlan_add_pvid(&v->port->pvid, v->vid);
59 } else {
60 if (br_vlan_is_master(v))
61 __vlan_delete_pvid(&v->br->pvid, v->vid);
62 else
63 __vlan_delete_pvid(&v->port->pvid, v->vid);
64 }
Vlad Yasevich35e03f32013-02-13 12:00:20 +000065
66 if (flags & BRIDGE_VLAN_INFO_UNTAGGED)
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +020067 v->flags |= BRIDGE_VLAN_INFO_UNTAGGED;
Vlad Yasevich635126b2014-09-12 16:26:17 -040068 else
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +020069 v->flags &= ~BRIDGE_VLAN_INFO_UNTAGGED;
Vlad Yasevich35e03f32013-02-13 12:00:20 +000070}
71
Scott Feldman7f109532015-06-12 17:39:50 -070072static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,
73 u16 vid, u16 flags)
74{
75 const struct net_device_ops *ops = dev->netdev_ops;
76 int err;
77
78 /* If driver uses VLAN ndo ops, use 8021q to install vid
79 * on device, otherwise try switchdev ops to install vid.
80 */
81
82 if (ops->ndo_vlan_rx_add_vid) {
83 err = vlan_vid_add(dev, br->vlan_proto, vid);
84 } else {
Vivien Didelotab069002015-09-29 12:07:17 -040085 struct switchdev_obj_vlan v = {
86 .flags = flags,
87 .vid_begin = vid,
88 .vid_end = vid,
Scott Feldman7f109532015-06-12 17:39:50 -070089 };
90
Vivien Didelotab069002015-09-29 12:07:17 -040091 err = switchdev_port_obj_add(dev, SWITCHDEV_OBJ_PORT_VLAN, &v);
Scott Feldman7f109532015-06-12 17:39:50 -070092 if (err == -EOPNOTSUPP)
93 err = 0;
94 }
95
96 return err;
97}
98
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +020099static void __vlan_add_list(struct net_bridge_vlan *v)
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000100{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200101 struct list_head *headp, *hpos;
102 struct net_bridge_vlan *vent;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000103
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200104 headp = br_vlan_is_master(v) ? &v->br->vlgrp->vlan_list :
105 &v->port->vlgrp->vlan_list;
106 list_for_each_prev(hpos, headp) {
107 vent = list_entry(hpos, struct net_bridge_vlan, vlist);
108 if (v->vid < vent->vid)
109 continue;
110 else
111 break;
Vlad Yasevich552406c2013-02-13 12:00:15 +0000112 }
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200113 list_add(&v->vlist, hpos);
114}
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000115
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200116static void __vlan_del_list(struct net_bridge_vlan *v)
117{
118 list_del(&v->vlist);
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000119}
120
Vivien Didelotbf361ad2015-09-05 21:27:57 -0400121static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
122 u16 vid)
Scott Feldman7f109532015-06-12 17:39:50 -0700123{
124 const struct net_device_ops *ops = dev->netdev_ops;
Vivien Didelotbf361ad2015-09-05 21:27:57 -0400125 int err = 0;
Scott Feldman7f109532015-06-12 17:39:50 -0700126
127 /* If driver uses VLAN ndo ops, use 8021q to delete vid
128 * on device, otherwise try switchdev ops to delete vid.
129 */
130
131 if (ops->ndo_vlan_rx_kill_vid) {
132 vlan_vid_del(dev, br->vlan_proto, vid);
133 } else {
Vivien Didelotab069002015-09-29 12:07:17 -0400134 struct switchdev_obj_vlan v = {
135 .vid_begin = vid,
136 .vid_end = vid,
Scott Feldman7f109532015-06-12 17:39:50 -0700137 };
138
Vivien Didelotab069002015-09-29 12:07:17 -0400139 err = switchdev_port_obj_del(dev, SWITCHDEV_OBJ_PORT_VLAN, &v);
Vivien Didelotbf361ad2015-09-05 21:27:57 -0400140 if (err == -EOPNOTSUPP)
141 err = 0;
Scott Feldman7f109532015-06-12 17:39:50 -0700142 }
Vivien Didelotbf361ad2015-09-05 21:27:57 -0400143
144 return err;
Scott Feldman7f109532015-06-12 17:39:50 -0700145}
146
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200147/* This is the shared VLAN add function which works for both ports and bridge
148 * devices. There are four possible calls to this function in terms of the
149 * vlan entry type:
150 * 1. vlan is being added on a port (no master flags, global entry exists)
151 * 2. vlan is being added on a bridge (both master and brvlan flags)
152 * 3. vlan is being added on a port, but a global entry didn't exist which
153 * is being created right now (master flag set, brvlan flag unset), the
154 * global entry is used for global per-vlan features, but not for filtering
155 * 4. same as 3 but with both master and brvlan flags set so the entry
156 * will be used for filtering in both the port and the bridge
157 */
158static int __vlan_add(struct net_bridge_vlan *v, u16 flags)
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000159{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200160 struct net_bridge_vlan *masterv = NULL;
161 struct net_bridge_port *p = NULL;
162 struct rhashtable *tbl;
163 struct net_device *dev;
164 struct net_bridge *br;
165 int err;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000166
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200167 if (br_vlan_is_master(v)) {
168 br = v->br;
169 dev = br->dev;
170 tbl = &br->vlgrp->vlan_hash;
171 } else {
172 p = v->port;
173 br = p->br;
174 dev = p->dev;
175 tbl = &p->vlgrp->vlan_hash;
176 }
Vlad Yasevich552406c2013-02-13 12:00:15 +0000177
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200178 if (p) {
179 u16 master_flags = flags;
Vivien Didelotbf361ad2015-09-05 21:27:57 -0400180
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200181 /* Add VLAN to the device filter if it is supported.
182 * This ensures tagged traffic enters the bridge when
183 * promiscuous mode is disabled by br_manage_promisc().
184 */
185 err = __vlan_vid_add(dev, br, v->vid, flags);
Vivien Didelotbf361ad2015-09-05 21:27:57 -0400186 if (err)
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200187 goto out;
188
189 /* need to work on the master vlan too */
190 if (flags & BRIDGE_VLAN_INFO_MASTER) {
191 master_flags |= BRIDGE_VLAN_INFO_BRENTRY;
192 err = br_vlan_add(br, v->vid, master_flags);
193 if (err)
194 goto out_filt;
195 }
196
197 masterv = br_vlan_find(br->vlgrp, v->vid);
198 if (!masterv) {
199 /* missing global ctx, create it now */
200 err = br_vlan_add(br, v->vid, master_flags);
201 if (err)
202 goto out_filt;
203 masterv = br_vlan_find(br->vlgrp, v->vid);
204 WARN_ON(!masterv);
205 }
206 atomic_inc(&masterv->refcnt);
207 v->brvlan = masterv;
Toshiaki Makita8580e212014-06-10 20:59:23 +0900208 }
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000209
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200210 /* Add the dev mac only if it's a usable vlan */
211 if (br_vlan_should_use(v)) {
212 err = br_fdb_insert(br, p, dev->dev_addr, v->vid);
213 if (err) {
214 br_err(br, "failed insert local address into bridge forwarding table\n");
215 goto out_filt;
216 }
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000217 }
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200218
219 err = rhashtable_lookup_insert_fast(tbl, &v->vnode, br_vlan_rht_params);
220 if (err)
221 goto out_fdb_insert;
222
223 __vlan_add_list(v);
224 __vlan_add_flags(v, flags);
225 if (br_vlan_is_master(v)) {
226 if (br_vlan_is_brentry(v))
227 br->vlgrp->num_vlans++;
228 } else {
229 p->vlgrp->num_vlans++;
230 }
231out:
232 return err;
233
234out_fdb_insert:
235 br_fdb_find_delete_local(br, p, br->dev->dev_addr, v->vid);
236
237out_filt:
238 if (p) {
239 __vlan_vid_del(dev, br, v->vid);
240 if (masterv) {
241 atomic_dec(&masterv->refcnt);
242 v->brvlan = NULL;
243 }
244 }
245
246 goto out;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000247}
248
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200249static int __vlan_del(struct net_bridge_vlan *v)
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000250{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200251 struct net_bridge_vlan *masterv = v;
252 struct net_bridge_port *p = NULL;
253 struct net_bridge *br;
254 int err = 0;
255 struct rhashtable *tbl;
256 u16 *pvid;
257
258 if (br_vlan_is_master(v)) {
259 br = v->br;
260 tbl = &v->br->vlgrp->vlan_hash;
261 pvid = &v->br->pvid;
262 } else {
263 p = v->port;
264 br = p->br;
265 tbl = &p->vlgrp->vlan_hash;
266 masterv = v->brvlan;
267 pvid = &p->pvid;
268 }
269
270 __vlan_delete_pvid(pvid, v->vid);
271 if (p) {
272 err = __vlan_vid_del(p->dev, p->br, v->vid);
273 if (err)
274 goto out;
275 }
276
277 if (br_vlan_is_master(v)) {
278 if (br_vlan_is_brentry(v)) {
279 v->flags &= ~BRIDGE_VLAN_INFO_BRENTRY;
280 br->vlgrp->num_vlans--;
281 }
282 } else {
283 p->vlgrp->num_vlans--;
284 }
285
286 if (masterv != v) {
287 rhashtable_remove_fast(tbl, &v->vnode, br_vlan_rht_params);
288 __vlan_del_list(v);
289 kfree_rcu(v, rcu);
290 }
291
292 if (atomic_dec_and_test(&masterv->refcnt)) {
293 rhashtable_remove_fast(&masterv->br->vlgrp->vlan_hash,
294 &masterv->vnode, br_vlan_rht_params);
295 __vlan_del_list(masterv);
296 kfree_rcu(masterv, rcu);
297 }
298out:
299 return err;
300}
301
302static void __vlan_flush(struct net_bridge_vlan_group *vlgrp, u16 *pvid)
303{
304 struct net_bridge_vlan *vlan, *tmp;
305
306 __vlan_delete_pvid(pvid, *pvid);
307 list_for_each_entry_safe(vlan, tmp, &vlgrp->vlan_list, vlist)
308 __vlan_del(vlan);
309 rhashtable_destroy(&vlgrp->vlan_hash);
310 kfree(vlgrp);
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000311}
312
Vlad Yasevich78851982013-02-13 12:00:14 +0000313struct sk_buff *br_handle_vlan(struct net_bridge *br,
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200314 struct net_bridge_vlan_group *vg,
Vlad Yasevich78851982013-02-13 12:00:14 +0000315 struct sk_buff *skb)
Vlad Yasevicha37b85c2013-02-13 12:00:10 +0000316{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200317 struct net_bridge_vlan *v;
Vlad Yasevicha37b85c2013-02-13 12:00:10 +0000318 u16 vid;
319
Vlad Yasevich20adfa12014-09-12 16:26:16 -0400320 /* If this packet was not filtered at input, let it pass */
321 if (!BR_INPUT_SKB_CB(skb)->vlan_filtered)
Vlad Yasevich78851982013-02-13 12:00:14 +0000322 goto out;
323
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200324 /* At this point, we know that the frame was filtered and contains
325 * a valid vlan id. If the vlan id has untagged flag set,
326 * send untagged; otherwise, send tagged.
327 */
328 br_vlan_get_tag(skb, &vid);
329 v = br_vlan_find(vg, vid);
330 /* Vlan entry must be configured at this point. The
Vlad Yasevichfc92f742014-03-27 21:51:18 -0400331 * only exception is the bridge is set in promisc mode and the
332 * packet is destined for the bridge device. In this case
333 * pass the packet as is.
334 */
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200335 if (!v || !br_vlan_should_use(v)) {
Vlad Yasevichfc92f742014-03-27 21:51:18 -0400336 if ((br->dev->flags & IFF_PROMISC) && skb->dev == br->dev) {
337 goto out;
338 } else {
339 kfree_skb(skb);
340 return NULL;
341 }
342 }
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200343 if (v->flags & BRIDGE_VLAN_INFO_UNTAGGED)
Toshiaki Makita99b192d2014-03-27 21:46:56 +0900344 skb->vlan_tci = 0;
Vlad Yasevich78851982013-02-13 12:00:14 +0000345
346out:
347 return skb;
348}
349
350/* Called under RCU */
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200351static bool __allowed_ingress(struct rhashtable *tbl, u16 pvid, __be16 proto,
352 struct sk_buff *skb, u16 *vid)
Vlad Yasevich78851982013-02-13 12:00:14 +0000353{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200354 const struct net_bridge_vlan *v;
Toshiaki Makita8580e212014-06-10 20:59:23 +0900355 bool tagged;
Vlad Yasevicha37b85c2013-02-13 12:00:10 +0000356
Vlad Yasevich20adfa12014-09-12 16:26:16 -0400357 BR_INPUT_SKB_CB(skb)->vlan_filtered = true;
Toshiaki Makita12464bb2014-03-27 21:46:55 +0900358 /* If vlan tx offload is disabled on bridge device and frame was
359 * sent from vlan device on the bridge device, it does not have
360 * HW accelerated vlan tag.
361 */
Jiri Pirkodf8a39d2015-01-13 17:13:44 +0100362 if (unlikely(!skb_vlan_tag_present(skb) &&
Toshiaki Makita8580e212014-06-10 20:59:23 +0900363 skb->protocol == proto)) {
Vlad Yasevich0d5501c2014-08-08 14:42:13 -0400364 skb = skb_vlan_untag(skb);
Toshiaki Makita12464bb2014-03-27 21:46:55 +0900365 if (unlikely(!skb))
366 return false;
367 }
368
Toshiaki Makita8580e212014-06-10 20:59:23 +0900369 if (!br_vlan_get_tag(skb, vid)) {
370 /* Tagged frame */
371 if (skb->vlan_proto != proto) {
372 /* Protocol-mismatch, empty out vlan_tci for new tag */
373 skb_push(skb, ETH_HLEN);
Jiri Pirko62749e22014-11-19 14:04:58 +0100374 skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,
Jiri Pirkodf8a39d2015-01-13 17:13:44 +0100375 skb_vlan_tag_get(skb));
Toshiaki Makita8580e212014-06-10 20:59:23 +0900376 if (unlikely(!skb))
377 return false;
378
379 skb_pull(skb, ETH_HLEN);
380 skb_reset_mac_len(skb);
381 *vid = 0;
382 tagged = false;
383 } else {
384 tagged = true;
385 }
386 } else {
387 /* Untagged frame */
388 tagged = false;
389 }
390
Toshiaki Makitab90356ce2013-10-16 17:07:14 +0900391 if (!*vid) {
Toshiaki Makitab90356ce2013-10-16 17:07:14 +0900392 /* Frame had a tag with VID 0 or did not have a tag.
393 * See if pvid is set on this port. That tells us which
394 * vlan untagged or priority-tagged traffic belongs to.
Vlad Yasevich78851982013-02-13 12:00:14 +0000395 */
Vlad Yasevich3df6bf42014-10-03 11:29:17 -0400396 if (!pvid)
Toshiaki Makitaeb707612014-04-09 17:00:30 +0900397 goto drop;
Vlad Yasevich78851982013-02-13 12:00:14 +0000398
Toshiaki Makitab90356ce2013-10-16 17:07:14 +0900399 /* PVID is set on this port. Any untagged or priority-tagged
400 * ingress frame is considered to belong to this vlan.
Vlad Yasevich78851982013-02-13 12:00:14 +0000401 */
Toshiaki Makitadfb5fa32013-10-16 17:07:16 +0900402 *vid = pvid;
Toshiaki Makita8580e212014-06-10 20:59:23 +0900403 if (likely(!tagged))
Toshiaki Makitab90356ce2013-10-16 17:07:14 +0900404 /* Untagged Frame. */
Toshiaki Makita8580e212014-06-10 20:59:23 +0900405 __vlan_hwaccel_put_tag(skb, proto, pvid);
Toshiaki Makitab90356ce2013-10-16 17:07:14 +0900406 else
407 /* Priority-tagged Frame.
408 * At this point, We know that skb->vlan_tci had
409 * VLAN_TAG_PRESENT bit and its VID field was 0x000.
410 * We update only VID field and preserve PCP field.
411 */
412 skb->vlan_tci |= pvid;
413
Vlad Yasevich78851982013-02-13 12:00:14 +0000414 return true;
415 }
416
417 /* Frame had a valid vlan tag. See if vlan is allowed */
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200418 v = br_vlan_lookup(tbl, *vid);
419 if (v && br_vlan_should_use(v))
Vlad Yasevicha37b85c2013-02-13 12:00:10 +0000420 return true;
Toshiaki Makitaeb707612014-04-09 17:00:30 +0900421drop:
422 kfree_skb(skb);
Vlad Yasevicha37b85c2013-02-13 12:00:10 +0000423 return false;
424}
425
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200426bool br_allowed_ingress(struct net_bridge *br, struct sk_buff *skb, u16 *vid)
427{
428 /* If VLAN filtering is disabled on the bridge, all packets are
429 * permitted.
430 */
431 if (!br->vlan_enabled) {
432 BR_INPUT_SKB_CB(skb)->vlan_filtered = false;
433 return true;
434 }
435
436 return __allowed_ingress(&br->vlgrp->vlan_hash, br->pvid,
437 br->vlan_proto, skb, vid);
438}
439
440bool nbp_allowed_ingress(struct net_bridge_port *p, struct sk_buff *skb,
441 u16 *vid)
442{
443 struct net_bridge *br = p->br;
444
445 /* If VLAN filtering is disabled on the bridge, all packets are
446 * permitted.
447 */
448 if (!br->vlan_enabled) {
449 BR_INPUT_SKB_CB(skb)->vlan_filtered = false;
450 return true;
451 }
452
453 return __allowed_ingress(&p->vlgrp->vlan_hash, p->pvid, br->vlan_proto,
454 skb, vid);
455}
456
Vlad Yasevich85f46c62013-02-13 12:00:11 +0000457/* Called under RCU. */
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200458bool br_allowed_egress(struct net_bridge_vlan_group *vg,
Vlad Yasevich85f46c62013-02-13 12:00:11 +0000459 const struct sk_buff *skb)
460{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200461 const struct net_bridge_vlan *v;
Vlad Yasevich85f46c62013-02-13 12:00:11 +0000462 u16 vid;
463
Vlad Yasevich20adfa12014-09-12 16:26:16 -0400464 /* If this packet was not filtered at input, let it pass */
465 if (!BR_INPUT_SKB_CB(skb)->vlan_filtered)
Vlad Yasevich85f46c62013-02-13 12:00:11 +0000466 return true;
467
Vlad Yasevich85f46c62013-02-13 12:00:11 +0000468 br_vlan_get_tag(skb, &vid);
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200469 v = br_vlan_find(vg, vid);
470 if (v && br_vlan_should_use(v))
Vlad Yasevich85f46c62013-02-13 12:00:11 +0000471 return true;
472
473 return false;
474}
475
Toshiaki Makitae0d79682014-05-26 15:15:53 +0900476/* Called under RCU */
477bool br_should_learn(struct net_bridge_port *p, struct sk_buff *skb, u16 *vid)
478{
479 struct net_bridge *br = p->br;
Toshiaki Makitae0d79682014-05-26 15:15:53 +0900480
Vlad Yasevich20adfa12014-09-12 16:26:16 -0400481 /* If filtering was disabled at input, let it pass. */
Vlad Yasevichc095f242014-09-15 15:24:26 -0400482 if (!br->vlan_enabled)
Toshiaki Makitae0d79682014-05-26 15:15:53 +0900483 return true;
484
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200485 if (!p->vlgrp->num_vlans)
Toshiaki Makitae0d79682014-05-26 15:15:53 +0900486 return false;
487
Toshiaki Makita8580e212014-06-10 20:59:23 +0900488 if (!br_vlan_get_tag(skb, vid) && skb->vlan_proto != br->vlan_proto)
489 *vid = 0;
490
Toshiaki Makitae0d79682014-05-26 15:15:53 +0900491 if (!*vid) {
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200492 *vid = nbp_get_pvid(p);
Vlad Yasevich3df6bf42014-10-03 11:29:17 -0400493 if (!*vid)
Toshiaki Makitae0d79682014-05-26 15:15:53 +0900494 return false;
495
496 return true;
497 }
498
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200499 if (br_vlan_find(p->vlgrp, *vid))
Toshiaki Makitae0d79682014-05-26 15:15:53 +0900500 return true;
501
502 return false;
503}
504
Toshiaki Makita8adff412013-10-16 17:07:13 +0900505/* Must be protected by RTNL.
506 * Must be called with vid in range from 1 to 4094 inclusive.
507 */
Vlad Yasevich552406c2013-02-13 12:00:15 +0000508int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags)
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000509{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200510 struct net_bridge_vlan *vlan;
511 int ret;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000512
513 ASSERT_RTNL();
514
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200515 vlan = br_vlan_find(br->vlgrp, vid);
516 if (vlan) {
517 if (!br_vlan_is_brentry(vlan)) {
518 /* Trying to change flags of non-existent bridge vlan */
519 if (!(flags & BRIDGE_VLAN_INFO_BRENTRY))
520 return -EINVAL;
521 /* It was only kept for port vlans, now make it real */
522 ret = br_fdb_insert(br, NULL, br->dev->dev_addr,
523 vlan->vid);
524 if (ret) {
525 br_err(br, "failed insert local address into bridge forwarding table\n");
526 return ret;
527 }
528 atomic_inc(&vlan->refcnt);
529 vlan->flags |= BRIDGE_VLAN_INFO_BRENTRY;
530 br->vlgrp->num_vlans++;
531 }
532 __vlan_add_flags(vlan, flags);
533 return 0;
534 }
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000535
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200536 vlan = kzalloc(sizeof(*vlan), GFP_KERNEL);
537 if (!vlan)
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000538 return -ENOMEM;
539
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200540 vlan->vid = vid;
541 vlan->flags = flags | BRIDGE_VLAN_INFO_MASTER;
542 vlan->flags &= ~BRIDGE_VLAN_INFO_PVID;
543 vlan->br = br;
544 if (flags & BRIDGE_VLAN_INFO_BRENTRY)
545 atomic_set(&vlan->refcnt, 1);
546 ret = __vlan_add(vlan, flags);
547 if (ret)
548 kfree(vlan);
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000549
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200550 return ret;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000551}
552
Toshiaki Makita8adff412013-10-16 17:07:13 +0900553/* Must be protected by RTNL.
554 * Must be called with vid in range from 1 to 4094 inclusive.
555 */
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000556int br_vlan_delete(struct net_bridge *br, u16 vid)
557{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200558 struct net_bridge_vlan *v;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000559
560 ASSERT_RTNL();
561
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200562 v = br_vlan_find(br->vlgrp, vid);
563 if (!v || !br_vlan_is_brentry(v))
564 return -ENOENT;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000565
Toshiaki Makita424bb9c2014-02-07 16:48:25 +0900566 br_fdb_find_delete_local(br, NULL, br->dev->dev_addr, vid);
Vlad Yasevichbc9a25d2013-02-13 12:00:19 +0000567
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200568 return __vlan_del(v);
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000569}
570
571void br_vlan_flush(struct net_bridge *br)
572{
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000573 ASSERT_RTNL();
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000574
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200575 __vlan_flush(br_vlan_group(br), &br->pvid);
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000576}
577
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200578struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg, u16 vid)
Toshiaki Makita2b292fb2014-02-07 16:48:22 +0900579{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200580 if (!vg)
581 return NULL;
Toshiaki Makita2b292fb2014-02-07 16:48:22 +0900582
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200583 return br_vlan_lookup(&vg->vlan_hash, vid);
Toshiaki Makita2b292fb2014-02-07 16:48:22 +0900584}
585
Toshiaki Makita204177f2014-06-10 20:59:25 +0900586/* Must be protected by RTNL. */
587static void recalculate_group_addr(struct net_bridge *br)
588{
589 if (br->group_addr_set)
590 return;
591
592 spin_lock_bh(&br->lock);
593 if (!br->vlan_enabled || br->vlan_proto == htons(ETH_P_8021Q)) {
594 /* Bridge Group Address */
595 br->group_addr[5] = 0x00;
596 } else { /* vlan_enabled && ETH_P_8021AD */
597 /* Provider Bridge Group Address */
598 br->group_addr[5] = 0x08;
599 }
600 spin_unlock_bh(&br->lock);
601}
602
603/* Must be protected by RTNL. */
604void br_recalculate_fwd_mask(struct net_bridge *br)
605{
606 if (!br->vlan_enabled || br->vlan_proto == htons(ETH_P_8021Q))
607 br->group_fwd_mask_required = BR_GROUPFWD_DEFAULT;
608 else /* vlan_enabled && ETH_P_8021AD */
609 br->group_fwd_mask_required = BR_GROUPFWD_8021AD &
610 ~(1u << br->group_addr[5]);
611}
612
Nikolay Aleksandrova7854032015-08-07 19:40:45 +0300613int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000614{
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000615 if (br->vlan_enabled == val)
Nikolay Aleksandrova7854032015-08-07 19:40:45 +0300616 return 0;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000617
618 br->vlan_enabled = val;
Vlad Yasevich2796d0c2014-05-16 09:59:20 -0400619 br_manage_promisc(br);
Toshiaki Makita204177f2014-06-10 20:59:25 +0900620 recalculate_group_addr(br);
621 br_recalculate_fwd_mask(br);
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000622
Nikolay Aleksandrova7854032015-08-07 19:40:45 +0300623 return 0;
624}
625
626int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)
627{
628 if (!rtnl_trylock())
629 return restart_syscall();
630
631 __br_vlan_filter_toggle(br, val);
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000632 rtnl_unlock();
Nikolay Aleksandrova7854032015-08-07 19:40:45 +0300633
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000634 return 0;
635}
636
Toshiaki Makitad2d427b2015-08-27 15:32:26 +0900637int __br_vlan_set_proto(struct net_bridge *br, __be16 proto)
Toshiaki Makita204177f2014-06-10 20:59:25 +0900638{
639 int err = 0;
640 struct net_bridge_port *p;
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200641 struct net_bridge_vlan *vlan;
Toshiaki Makitad2d427b2015-08-27 15:32:26 +0900642 __be16 oldproto;
Toshiaki Makita204177f2014-06-10 20:59:25 +0900643
Toshiaki Makita204177f2014-06-10 20:59:25 +0900644 if (br->vlan_proto == proto)
Toshiaki Makitad2d427b2015-08-27 15:32:26 +0900645 return 0;
Toshiaki Makita204177f2014-06-10 20:59:25 +0900646
647 /* Add VLANs for the new proto to the device filter. */
648 list_for_each_entry(p, &br->port_list, list) {
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200649 list_for_each_entry(vlan, &p->vlgrp->vlan_list, vlist) {
650 err = vlan_vid_add(p->dev, proto, vlan->vid);
Toshiaki Makita204177f2014-06-10 20:59:25 +0900651 if (err)
652 goto err_filt;
653 }
654 }
655
656 oldproto = br->vlan_proto;
657 br->vlan_proto = proto;
658
659 recalculate_group_addr(br);
660 br_recalculate_fwd_mask(br);
661
662 /* Delete VLANs for the old proto from the device filter. */
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200663 list_for_each_entry(p, &br->port_list, list)
664 list_for_each_entry(vlan, &p->vlgrp->vlan_list, vlist)
665 vlan_vid_del(p->dev, oldproto, vlan->vid);
Toshiaki Makita204177f2014-06-10 20:59:25 +0900666
Toshiaki Makitad2d427b2015-08-27 15:32:26 +0900667 return 0;
Toshiaki Makita204177f2014-06-10 20:59:25 +0900668
669err_filt:
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200670 list_for_each_entry_continue_reverse(vlan, &p->vlgrp->vlan_list, vlist)
671 vlan_vid_del(p->dev, proto, vlan->vid);
Toshiaki Makita204177f2014-06-10 20:59:25 +0900672
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200673 list_for_each_entry_continue_reverse(p, &br->port_list, list)
674 list_for_each_entry(vlan, &p->vlgrp->vlan_list, vlist)
675 vlan_vid_del(p->dev, proto, vlan->vid);
Toshiaki Makita204177f2014-06-10 20:59:25 +0900676
Toshiaki Makitad2d427b2015-08-27 15:32:26 +0900677 return err;
678}
679
680int br_vlan_set_proto(struct net_bridge *br, unsigned long val)
681{
682 int err;
683
684 if (val != ETH_P_8021Q && val != ETH_P_8021AD)
685 return -EPROTONOSUPPORT;
686
687 if (!rtnl_trylock())
688 return restart_syscall();
689
690 err = __br_vlan_set_proto(br, htons(val));
691 rtnl_unlock();
692
693 return err;
Toshiaki Makita204177f2014-06-10 20:59:25 +0900694}
695
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200696static bool vlan_default_pvid(struct net_bridge_vlan_group *vg, u16 pvid,
697 u16 vid)
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400698{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200699 struct net_bridge_vlan *v;
700
701 if (vid != pvid)
702 return false;
703
704 v = br_vlan_lookup(&vg->vlan_hash, vid);
705 if (v && br_vlan_should_use(v) &&
706 (v->flags & BRIDGE_VLAN_INFO_UNTAGGED))
707 return true;
708
709 return false;
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400710}
711
712static void br_vlan_disable_default_pvid(struct net_bridge *br)
713{
714 struct net_bridge_port *p;
715 u16 pvid = br->default_pvid;
716
717 /* Disable default_pvid on all ports where it is still
718 * configured.
719 */
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200720 if (vlan_default_pvid(br->vlgrp, br->pvid, pvid))
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400721 br_vlan_delete(br, pvid);
722
723 list_for_each_entry(p, &br->port_list, list) {
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200724 if (vlan_default_pvid(p->vlgrp, p->pvid, pvid))
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400725 nbp_vlan_delete(p, pvid);
726 }
727
728 br->default_pvid = 0;
729}
730
731static int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)
732{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200733 const struct net_bridge_vlan *pvent;
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400734 struct net_bridge_port *p;
735 u16 old_pvid;
736 int err = 0;
737 unsigned long *changed;
738
739 changed = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long),
740 GFP_KERNEL);
741 if (!changed)
742 return -ENOMEM;
743
744 old_pvid = br->default_pvid;
745
746 /* Update default_pvid config only if we do not conflict with
747 * user configuration.
748 */
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200749 pvent = br_vlan_find(br->vlgrp, pvid);
750 if ((!old_pvid || vlan_default_pvid(br->vlgrp, br->pvid, old_pvid)) &&
751 (!pvent || !br_vlan_should_use(pvent))) {
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400752 err = br_vlan_add(br, pvid,
753 BRIDGE_VLAN_INFO_PVID |
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200754 BRIDGE_VLAN_INFO_UNTAGGED |
755 BRIDGE_VLAN_INFO_BRENTRY);
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400756 if (err)
757 goto out;
758 br_vlan_delete(br, old_pvid);
759 set_bit(0, changed);
760 }
761
762 list_for_each_entry(p, &br->port_list, list) {
763 /* Update default_pvid config only if we do not conflict with
764 * user configuration.
765 */
766 if ((old_pvid &&
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200767 !vlan_default_pvid(p->vlgrp, p->pvid, old_pvid)) ||
768 br_vlan_find(p->vlgrp, pvid))
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400769 continue;
770
771 err = nbp_vlan_add(p, pvid,
772 BRIDGE_VLAN_INFO_PVID |
773 BRIDGE_VLAN_INFO_UNTAGGED);
774 if (err)
775 goto err_port;
776 nbp_vlan_delete(p, old_pvid);
777 set_bit(p->port_no, changed);
778 }
779
780 br->default_pvid = pvid;
781
782out:
783 kfree(changed);
784 return err;
785
786err_port:
787 list_for_each_entry_continue_reverse(p, &br->port_list, list) {
788 if (!test_bit(p->port_no, changed))
789 continue;
790
791 if (old_pvid)
792 nbp_vlan_add(p, old_pvid,
793 BRIDGE_VLAN_INFO_PVID |
794 BRIDGE_VLAN_INFO_UNTAGGED);
795 nbp_vlan_delete(p, pvid);
796 }
797
798 if (test_bit(0, changed)) {
799 if (old_pvid)
800 br_vlan_add(br, old_pvid,
801 BRIDGE_VLAN_INFO_PVID |
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200802 BRIDGE_VLAN_INFO_UNTAGGED |
803 BRIDGE_VLAN_INFO_BRENTRY);
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400804 br_vlan_delete(br, pvid);
805 }
806 goto out;
807}
808
Vlad Yasevich96a20d92014-10-03 11:29:16 -0400809int br_vlan_set_default_pvid(struct net_bridge *br, unsigned long val)
810{
811 u16 pvid = val;
812 int err = 0;
813
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400814 if (val >= VLAN_VID_MASK)
Vlad Yasevich96a20d92014-10-03 11:29:16 -0400815 return -EINVAL;
816
817 if (!rtnl_trylock())
818 return restart_syscall();
819
820 if (pvid == br->default_pvid)
821 goto unlock;
822
823 /* Only allow default pvid change when filtering is disabled */
824 if (br->vlan_enabled) {
825 pr_info_once("Please disable vlan filtering to change default_pvid\n");
826 err = -EPERM;
827 goto unlock;
828 }
829
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400830 if (!pvid)
831 br_vlan_disable_default_pvid(br);
832 else
833 err = __br_vlan_set_default_pvid(br, pvid);
Vlad Yasevich96a20d92014-10-03 11:29:16 -0400834
835unlock:
836 rtnl_unlock();
837 return err;
838}
839
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400840int br_vlan_init(struct net_bridge *br)
Toshiaki Makita8580e212014-06-10 20:59:23 +0900841{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200842 int ret = -ENOMEM;
843
844 br->vlgrp = kzalloc(sizeof(struct net_bridge_vlan_group), GFP_KERNEL);
845 if (!br->vlgrp)
846 goto out;
847 ret = rhashtable_init(&br->vlgrp->vlan_hash, &br_vlan_rht_params);
848 if (ret)
849 goto err_rhtbl;
850 INIT_LIST_HEAD(&br->vlgrp->vlan_list);
Toshiaki Makita8580e212014-06-10 20:59:23 +0900851 br->vlan_proto = htons(ETH_P_8021Q);
Vlad Yasevich96a20d92014-10-03 11:29:16 -0400852 br->default_pvid = 1;
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200853 ret = br_vlan_add(br, 1,
854 BRIDGE_VLAN_INFO_PVID | BRIDGE_VLAN_INFO_UNTAGGED |
855 BRIDGE_VLAN_INFO_BRENTRY);
856 if (ret)
857 goto err_vlan_add;
858
859out:
860 return ret;
861
862err_vlan_add:
863 rhashtable_destroy(&br->vlgrp->vlan_hash);
864err_rhtbl:
865 kfree(br->vlgrp);
866
867 goto out;
868}
869
870int nbp_vlan_init(struct net_bridge_port *p)
871{
872 int ret = -ENOMEM;
873
874 p->vlgrp = kzalloc(sizeof(struct net_bridge_vlan_group), GFP_KERNEL);
875 if (!p->vlgrp)
876 goto out;
877
878 ret = rhashtable_init(&p->vlgrp->vlan_hash, &br_vlan_rht_params);
879 if (ret)
880 goto err_rhtbl;
881 INIT_LIST_HEAD(&p->vlgrp->vlan_list);
882 if (p->br->default_pvid) {
883 ret = nbp_vlan_add(p, p->br->default_pvid,
884 BRIDGE_VLAN_INFO_PVID |
885 BRIDGE_VLAN_INFO_UNTAGGED);
886 if (ret)
887 goto err_vlan_add;
888 }
889out:
890 return ret;
891
892err_vlan_add:
893 rhashtable_destroy(&p->vlgrp->vlan_hash);
894err_rhtbl:
895 kfree(p->vlgrp);
896
897 goto out;
Toshiaki Makita8580e212014-06-10 20:59:23 +0900898}
899
Toshiaki Makita8adff412013-10-16 17:07:13 +0900900/* Must be protected by RTNL.
901 * Must be called with vid in range from 1 to 4094 inclusive.
902 */
Vlad Yasevich552406c2013-02-13 12:00:15 +0000903int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags)
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000904{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200905 struct net_bridge_vlan *vlan;
906 int ret;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000907
908 ASSERT_RTNL();
909
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200910 vlan = br_vlan_find(port->vlgrp, vid);
911 if (vlan) {
912 __vlan_add_flags(vlan, flags);
913 return 0;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000914 }
915
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200916 vlan = kzalloc(sizeof(*vlan), GFP_KERNEL);
917 if (!vlan)
918 return -ENOMEM;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000919
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200920 vlan->vid = vid;
921 vlan->port = port;
922 ret = __vlan_add(vlan, flags);
923 if (ret)
924 kfree(vlan);
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000925
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200926 return ret;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000927}
928
Toshiaki Makita8adff412013-10-16 17:07:13 +0900929/* Must be protected by RTNL.
930 * Must be called with vid in range from 1 to 4094 inclusive.
931 */
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000932int nbp_vlan_delete(struct net_bridge_port *port, u16 vid)
933{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200934 struct net_bridge_vlan *v;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000935
936 ASSERT_RTNL();
937
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200938 v = br_vlan_find(port->vlgrp, vid);
939 if (!v)
940 return -ENOENT;
Toshiaki Makita424bb9c2014-02-07 16:48:25 +0900941 br_fdb_find_delete_local(port->br, port, port->dev->dev_addr, vid);
Nikolay Aleksandrov1ea2d022015-06-23 05:28:16 -0700942 br_fdb_delete_by_port(port->br, port, vid, 0);
Vlad Yasevichbc9a25d2013-02-13 12:00:19 +0000943
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200944 return __vlan_del(v);
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000945}
946
947void nbp_vlan_flush(struct net_bridge_port *port)
948{
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200949 struct net_bridge_vlan *vlan;
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000950
951 ASSERT_RTNL();
952
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200953 list_for_each_entry(vlan, &port->vlgrp->vlan_list, vlist)
954 vlan_vid_del(port->dev, port->br->vlan_proto, vlan->vid);
Vlad Yasevich243a2e62013-02-13 12:00:09 +0000955
Nikolay Aleksandrov2594e902015-09-25 19:00:11 +0200956 __vlan_flush(nbp_vlan_group(port), &port->pvid);
Vlad Yasevich5be5a2d2014-10-03 11:29:18 -0400957}