xref: /openbmc/linux/net/bridge/br_vlan.c (revision dbbaf949)
1243a2e63SVlad Yasevich #include <linux/kernel.h>
2243a2e63SVlad Yasevich #include <linux/netdevice.h>
3243a2e63SVlad Yasevich #include <linux/rtnetlink.h>
4243a2e63SVlad Yasevich #include <linux/slab.h>
5243a2e63SVlad Yasevich 
6243a2e63SVlad Yasevich #include "br_private.h"
7243a2e63SVlad Yasevich 
8552406c4SVlad Yasevich static void __vlan_add_pvid(struct net_port_vlans *v, u16 vid)
9552406c4SVlad Yasevich {
10552406c4SVlad Yasevich 	if (v->pvid == vid)
11552406c4SVlad Yasevich 		return;
12552406c4SVlad Yasevich 
13552406c4SVlad Yasevich 	smp_wmb();
14552406c4SVlad Yasevich 	v->pvid = vid;
15552406c4SVlad Yasevich }
16552406c4SVlad Yasevich 
17552406c4SVlad Yasevich static void __vlan_delete_pvid(struct net_port_vlans *v, u16 vid)
18552406c4SVlad Yasevich {
19552406c4SVlad Yasevich 	if (v->pvid != vid)
20552406c4SVlad Yasevich 		return;
21552406c4SVlad Yasevich 
22552406c4SVlad Yasevich 	smp_wmb();
23552406c4SVlad Yasevich 	v->pvid = 0;
24552406c4SVlad Yasevich }
25552406c4SVlad Yasevich 
2635e03f3aSVlad Yasevich static void __vlan_add_flags(struct net_port_vlans *v, u16 vid, u16 flags)
2735e03f3aSVlad Yasevich {
2835e03f3aSVlad Yasevich 	if (flags & BRIDGE_VLAN_INFO_PVID)
2935e03f3aSVlad Yasevich 		__vlan_add_pvid(v, vid);
3035e03f3aSVlad Yasevich 
3135e03f3aSVlad Yasevich 	if (flags & BRIDGE_VLAN_INFO_UNTAGGED)
3235e03f3aSVlad Yasevich 		set_bit(vid, v->untagged_bitmap);
3335e03f3aSVlad Yasevich }
3435e03f3aSVlad Yasevich 
35552406c4SVlad Yasevich static int __vlan_add(struct net_port_vlans *v, u16 vid, u16 flags)
36243a2e63SVlad Yasevich {
37bc9a25d2SVlad Yasevich 	struct net_bridge_port *p = NULL;
38bc9a25d2SVlad Yasevich 	struct net_bridge *br;
39bc9a25d2SVlad Yasevich 	struct net_device *dev;
40243a2e63SVlad Yasevich 	int err;
41243a2e63SVlad Yasevich 
42552406c4SVlad Yasevich 	if (test_bit(vid, v->vlan_bitmap)) {
4335e03f3aSVlad Yasevich 		__vlan_add_flags(v, vid, flags);
44552406c4SVlad Yasevich 		return 0;
45552406c4SVlad Yasevich 	}
46243a2e63SVlad Yasevich 
47bc9a25d2SVlad Yasevich 	if (v->port_idx) {
48bc9a25d2SVlad Yasevich 		p = v->parent.port;
49bc9a25d2SVlad Yasevich 		br = p->br;
50bc9a25d2SVlad Yasevich 		dev = p->dev;
51bc9a25d2SVlad Yasevich 	} else {
52bc9a25d2SVlad Yasevich 		br = v->parent.br;
53bc9a25d2SVlad Yasevich 		dev = br->dev;
54bc9a25d2SVlad Yasevich 	}
55243a2e63SVlad Yasevich 
5619236837SToshiaki Makita 	if (p) {
57243a2e63SVlad Yasevich 		/* Add VLAN to the device filter if it is supported.
58bc9a25d2SVlad Yasevich 		 * Stricly speaking, this is not necessary now, since
59bc9a25d2SVlad Yasevich 		 * devices are made promiscuous by the bridge, but if
60bc9a25d2SVlad Yasevich 		 * that ever changes this code will allow tagged
61bc9a25d2SVlad Yasevich 		 * traffic to enter the bridge.
62243a2e63SVlad Yasevich 		 */
6319236837SToshiaki Makita 		err = vlan_vid_add(dev, htons(ETH_P_8021Q), vid);
64243a2e63SVlad Yasevich 		if (err)
65243a2e63SVlad Yasevich 			return err;
66243a2e63SVlad Yasevich 	}
67bc9a25d2SVlad Yasevich 
68bc9a25d2SVlad Yasevich 	err = br_fdb_insert(br, p, dev->dev_addr, vid);
69bc9a25d2SVlad Yasevich 	if (err) {
70bc9a25d2SVlad Yasevich 		br_err(br, "failed insert local address into bridge "
71bc9a25d2SVlad Yasevich 		       "forwarding table\n");
72bc9a25d2SVlad Yasevich 		goto out_filt;
73bc9a25d2SVlad Yasevich 	}
74bc9a25d2SVlad Yasevich 
75243a2e63SVlad Yasevich 	set_bit(vid, v->vlan_bitmap);
766cbdceebSVlad Yasevich 	v->num_vlans++;
7735e03f3aSVlad Yasevich 	__vlan_add_flags(v, vid, flags);
78552406c4SVlad Yasevich 
79243a2e63SVlad Yasevich 	return 0;
80bc9a25d2SVlad Yasevich 
81bc9a25d2SVlad Yasevich out_filt:
8219236837SToshiaki Makita 	if (p)
8319236837SToshiaki Makita 		vlan_vid_del(dev, htons(ETH_P_8021Q), vid);
84bc9a25d2SVlad Yasevich 	return err;
85243a2e63SVlad Yasevich }
86243a2e63SVlad Yasevich 
87243a2e63SVlad Yasevich static int __vlan_del(struct net_port_vlans *v, u16 vid)
88243a2e63SVlad Yasevich {
89243a2e63SVlad Yasevich 	if (!test_bit(vid, v->vlan_bitmap))
90243a2e63SVlad Yasevich 		return -EINVAL;
91243a2e63SVlad Yasevich 
92552406c4SVlad Yasevich 	__vlan_delete_pvid(v, vid);
9335e03f3aSVlad Yasevich 	clear_bit(vid, v->untagged_bitmap);
94552406c4SVlad Yasevich 
9519236837SToshiaki Makita 	if (v->port_idx)
9619236837SToshiaki Makita 		vlan_vid_del(v->parent.port->dev, htons(ETH_P_8021Q), vid);
97243a2e63SVlad Yasevich 
98243a2e63SVlad Yasevich 	clear_bit(vid, v->vlan_bitmap);
996cbdceebSVlad Yasevich 	v->num_vlans--;
100ef40b7efSToshiaki Makita 	if (bitmap_empty(v->vlan_bitmap, VLAN_N_VID)) {
101243a2e63SVlad Yasevich 		if (v->port_idx)
102243a2e63SVlad Yasevich 			rcu_assign_pointer(v->parent.port->vlan_info, NULL);
103243a2e63SVlad Yasevich 		else
104243a2e63SVlad Yasevich 			rcu_assign_pointer(v->parent.br->vlan_info, NULL);
105243a2e63SVlad Yasevich 		kfree_rcu(v, rcu);
106243a2e63SVlad Yasevich 	}
107243a2e63SVlad Yasevich 	return 0;
108243a2e63SVlad Yasevich }
109243a2e63SVlad Yasevich 
110243a2e63SVlad Yasevich static void __vlan_flush(struct net_port_vlans *v)
111243a2e63SVlad Yasevich {
112552406c4SVlad Yasevich 	smp_wmb();
113552406c4SVlad Yasevich 	v->pvid = 0;
114ef40b7efSToshiaki Makita 	bitmap_zero(v->vlan_bitmap, VLAN_N_VID);
115243a2e63SVlad Yasevich 	if (v->port_idx)
116243a2e63SVlad Yasevich 		rcu_assign_pointer(v->parent.port->vlan_info, NULL);
117243a2e63SVlad Yasevich 	else
118243a2e63SVlad Yasevich 		rcu_assign_pointer(v->parent.br->vlan_info, NULL);
119243a2e63SVlad Yasevich 	kfree_rcu(v, rcu);
120243a2e63SVlad Yasevich }
121243a2e63SVlad Yasevich 
12278851988SVlad Yasevich /* Strip the tag from the packet.  Will return skb with tci set 0.  */
12378851988SVlad Yasevich static struct sk_buff *br_vlan_untag(struct sk_buff *skb)
12478851988SVlad Yasevich {
12578851988SVlad Yasevich 	if (skb->protocol != htons(ETH_P_8021Q)) {
12678851988SVlad Yasevich 		skb->vlan_tci = 0;
12778851988SVlad Yasevich 		return skb;
12878851988SVlad Yasevich 	}
12978851988SVlad Yasevich 
13078851988SVlad Yasevich 	skb->vlan_tci = 0;
13178851988SVlad Yasevich 	skb = vlan_untag(skb);
13278851988SVlad Yasevich 	if (skb)
13378851988SVlad Yasevich 		skb->vlan_tci = 0;
13478851988SVlad Yasevich 
13578851988SVlad Yasevich 	return skb;
13678851988SVlad Yasevich }
13778851988SVlad Yasevich 
13878851988SVlad Yasevich struct sk_buff *br_handle_vlan(struct net_bridge *br,
13978851988SVlad Yasevich 			       const struct net_port_vlans *pv,
140a37b85c9SVlad Yasevich 			       struct sk_buff *skb)
141a37b85c9SVlad Yasevich {
142a37b85c9SVlad Yasevich 	u16 vid;
143a37b85c9SVlad Yasevich 
14478851988SVlad Yasevich 	if (!br->vlan_enabled)
14578851988SVlad Yasevich 		goto out;
14678851988SVlad Yasevich 
14778851988SVlad Yasevich 	/* At this point, we know that the frame was filtered and contains
14835e03f3aSVlad Yasevich 	 * a valid vlan id.  If the vlan id is set in the untagged bitmap,
14978851988SVlad Yasevich 	 * send untagged; otherwise, send taged.
15078851988SVlad Yasevich 	 */
15178851988SVlad Yasevich 	br_vlan_get_tag(skb, &vid);
15235e03f3aSVlad Yasevich 	if (test_bit(vid, pv->untagged_bitmap))
15378851988SVlad Yasevich 		skb = br_vlan_untag(skb);
15478851988SVlad Yasevich 	else {
15578851988SVlad Yasevich 		/* Egress policy says "send tagged".  If output device
15678851988SVlad Yasevich 		 * is the  bridge, we need to add the VLAN header
15778851988SVlad Yasevich 		 * ourselves since we'll be going through the RX path.
15878851988SVlad Yasevich 		 * Sending to ports puts the frame on the TX path and
15978851988SVlad Yasevich 		 * we let dev_hard_start_xmit() add the header.
16078851988SVlad Yasevich 		 */
16178851988SVlad Yasevich 		if (skb->protocol != htons(ETH_P_8021Q) &&
16278851988SVlad Yasevich 		    pv->port_idx == 0) {
16378851988SVlad Yasevich 			/* vlan_put_tag expects skb->data to point to
16478851988SVlad Yasevich 			 * mac header.
16578851988SVlad Yasevich 			 */
16678851988SVlad Yasevich 			skb_push(skb, ETH_HLEN);
16786a9bad3SPatrick McHardy 			skb = __vlan_put_tag(skb, skb->vlan_proto, skb->vlan_tci);
16878851988SVlad Yasevich 			if (!skb)
16978851988SVlad Yasevich 				goto out;
17078851988SVlad Yasevich 			/* put skb->data back to where it was */
17178851988SVlad Yasevich 			skb_pull(skb, ETH_HLEN);
17278851988SVlad Yasevich 			skb->vlan_tci = 0;
17378851988SVlad Yasevich 		}
17478851988SVlad Yasevich 	}
17578851988SVlad Yasevich 
17678851988SVlad Yasevich out:
17778851988SVlad Yasevich 	return skb;
17878851988SVlad Yasevich }
17978851988SVlad Yasevich 
18078851988SVlad Yasevich /* Called under RCU */
18178851988SVlad Yasevich bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
18278851988SVlad Yasevich 			struct sk_buff *skb, u16 *vid)
18378851988SVlad Yasevich {
184b90356ceSToshiaki Makita 	int err;
185b90356ceSToshiaki Makita 
186a37b85c9SVlad Yasevich 	/* If VLAN filtering is disabled on the bridge, all packets are
187a37b85c9SVlad Yasevich 	 * permitted.
188a37b85c9SVlad Yasevich 	 */
189a37b85c9SVlad Yasevich 	if (!br->vlan_enabled)
190a37b85c9SVlad Yasevich 		return true;
191a37b85c9SVlad Yasevich 
192a37b85c9SVlad Yasevich 	/* If there are no vlan in the permitted list, all packets are
193a37b85c9SVlad Yasevich 	 * rejected.
194a37b85c9SVlad Yasevich 	 */
195a37b85c9SVlad Yasevich 	if (!v)
196a37b85c9SVlad Yasevich 		return false;
197a37b85c9SVlad Yasevich 
198b90356ceSToshiaki Makita 	err = br_vlan_get_tag(skb, vid);
199b90356ceSToshiaki Makita 	if (!*vid) {
20078851988SVlad Yasevich 		u16 pvid = br_get_pvid(v);
20178851988SVlad Yasevich 
202b90356ceSToshiaki Makita 		/* Frame had a tag with VID 0 or did not have a tag.
203b90356ceSToshiaki Makita 		 * See if pvid is set on this port.  That tells us which
204b90356ceSToshiaki Makita 		 * vlan untagged or priority-tagged traffic belongs to.
20578851988SVlad Yasevich 		 */
20678851988SVlad Yasevich 		if (pvid == VLAN_N_VID)
20778851988SVlad Yasevich 			return false;
20878851988SVlad Yasevich 
209b90356ceSToshiaki Makita 		/* PVID is set on this port.  Any untagged or priority-tagged
210b90356ceSToshiaki Makita 		 * ingress frame is considered to belong to this vlan.
21178851988SVlad Yasevich 		 */
212dfb5fa32SToshiaki Makita 		*vid = pvid;
213b90356ceSToshiaki Makita 		if (likely(err))
214b90356ceSToshiaki Makita 			/* Untagged Frame. */
21586a9bad3SPatrick McHardy 			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid);
216b90356ceSToshiaki Makita 		else
217b90356ceSToshiaki Makita 			/* Priority-tagged Frame.
218b90356ceSToshiaki Makita 			 * At this point, We know that skb->vlan_tci had
219b90356ceSToshiaki Makita 			 * VLAN_TAG_PRESENT bit and its VID field was 0x000.
220b90356ceSToshiaki Makita 			 * We update only VID field and preserve PCP field.
221b90356ceSToshiaki Makita 			 */
222b90356ceSToshiaki Makita 			skb->vlan_tci |= pvid;
223b90356ceSToshiaki Makita 
22478851988SVlad Yasevich 		return true;
22578851988SVlad Yasevich 	}
22678851988SVlad Yasevich 
22778851988SVlad Yasevich 	/* Frame had a valid vlan tag.  See if vlan is allowed */
22878851988SVlad Yasevich 	if (test_bit(*vid, v->vlan_bitmap))
229a37b85c9SVlad Yasevich 		return true;
230a37b85c9SVlad Yasevich 
231a37b85c9SVlad Yasevich 	return false;
232a37b85c9SVlad Yasevich }
233a37b85c9SVlad Yasevich 
23485f46c6bSVlad Yasevich /* Called under RCU. */
23585f46c6bSVlad Yasevich bool br_allowed_egress(struct net_bridge *br,
23685f46c6bSVlad Yasevich 		       const struct net_port_vlans *v,
23785f46c6bSVlad Yasevich 		       const struct sk_buff *skb)
23885f46c6bSVlad Yasevich {
23985f46c6bSVlad Yasevich 	u16 vid;
24085f46c6bSVlad Yasevich 
24185f46c6bSVlad Yasevich 	if (!br->vlan_enabled)
24285f46c6bSVlad Yasevich 		return true;
24385f46c6bSVlad Yasevich 
24485f46c6bSVlad Yasevich 	if (!v)
24585f46c6bSVlad Yasevich 		return false;
24685f46c6bSVlad Yasevich 
24785f46c6bSVlad Yasevich 	br_vlan_get_tag(skb, &vid);
24885f46c6bSVlad Yasevich 	if (test_bit(vid, v->vlan_bitmap))
24985f46c6bSVlad Yasevich 		return true;
25085f46c6bSVlad Yasevich 
25185f46c6bSVlad Yasevich 	return false;
25285f46c6bSVlad Yasevich }
25385f46c6bSVlad Yasevich 
2548adff41cSToshiaki Makita /* Must be protected by RTNL.
2558adff41cSToshiaki Makita  * Must be called with vid in range from 1 to 4094 inclusive.
2568adff41cSToshiaki Makita  */
257552406c4SVlad Yasevich int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags)
258243a2e63SVlad Yasevich {
259243a2e63SVlad Yasevich 	struct net_port_vlans *pv = NULL;
260243a2e63SVlad Yasevich 	int err;
261243a2e63SVlad Yasevich 
262243a2e63SVlad Yasevich 	ASSERT_RTNL();
263243a2e63SVlad Yasevich 
264243a2e63SVlad Yasevich 	pv = rtnl_dereference(br->vlan_info);
265243a2e63SVlad Yasevich 	if (pv)
266552406c4SVlad Yasevich 		return __vlan_add(pv, vid, flags);
267243a2e63SVlad Yasevich 
268243a2e63SVlad Yasevich 	/* Create port vlan infomration
269243a2e63SVlad Yasevich 	 */
270243a2e63SVlad Yasevich 	pv = kzalloc(sizeof(*pv), GFP_KERNEL);
271243a2e63SVlad Yasevich 	if (!pv)
272243a2e63SVlad Yasevich 		return -ENOMEM;
273243a2e63SVlad Yasevich 
274243a2e63SVlad Yasevich 	pv->parent.br = br;
275552406c4SVlad Yasevich 	err = __vlan_add(pv, vid, flags);
276243a2e63SVlad Yasevich 	if (err)
277243a2e63SVlad Yasevich 		goto out;
278243a2e63SVlad Yasevich 
279243a2e63SVlad Yasevich 	rcu_assign_pointer(br->vlan_info, pv);
280243a2e63SVlad Yasevich 	return 0;
281243a2e63SVlad Yasevich out:
282243a2e63SVlad Yasevich 	kfree(pv);
283243a2e63SVlad Yasevich 	return err;
284243a2e63SVlad Yasevich }
285243a2e63SVlad Yasevich 
2868adff41cSToshiaki Makita /* Must be protected by RTNL.
2878adff41cSToshiaki Makita  * Must be called with vid in range from 1 to 4094 inclusive.
2888adff41cSToshiaki Makita  */
289243a2e63SVlad Yasevich int br_vlan_delete(struct net_bridge *br, u16 vid)
290243a2e63SVlad Yasevich {
291243a2e63SVlad Yasevich 	struct net_port_vlans *pv;
292243a2e63SVlad Yasevich 
293243a2e63SVlad Yasevich 	ASSERT_RTNL();
294243a2e63SVlad Yasevich 
295243a2e63SVlad Yasevich 	pv = rtnl_dereference(br->vlan_info);
296243a2e63SVlad Yasevich 	if (!pv)
297243a2e63SVlad Yasevich 		return -EINVAL;
298243a2e63SVlad Yasevich 
299bc9a25d2SVlad Yasevich 	spin_lock_bh(&br->hash_lock);
300bc9a25d2SVlad Yasevich 	fdb_delete_by_addr(br, br->dev->dev_addr, vid);
301bc9a25d2SVlad Yasevich 	spin_unlock_bh(&br->hash_lock);
302bc9a25d2SVlad Yasevich 
303243a2e63SVlad Yasevich 	__vlan_del(pv, vid);
304243a2e63SVlad Yasevich 	return 0;
305243a2e63SVlad Yasevich }
306243a2e63SVlad Yasevich 
307243a2e63SVlad Yasevich void br_vlan_flush(struct net_bridge *br)
308243a2e63SVlad Yasevich {
309243a2e63SVlad Yasevich 	struct net_port_vlans *pv;
310243a2e63SVlad Yasevich 
311243a2e63SVlad Yasevich 	ASSERT_RTNL();
312243a2e63SVlad Yasevich 	pv = rtnl_dereference(br->vlan_info);
313243a2e63SVlad Yasevich 	if (!pv)
314243a2e63SVlad Yasevich 		return;
315243a2e63SVlad Yasevich 
316243a2e63SVlad Yasevich 	__vlan_flush(pv);
317243a2e63SVlad Yasevich }
318243a2e63SVlad Yasevich 
319243a2e63SVlad Yasevich int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)
320243a2e63SVlad Yasevich {
321243a2e63SVlad Yasevich 	if (!rtnl_trylock())
322243a2e63SVlad Yasevich 		return restart_syscall();
323243a2e63SVlad Yasevich 
324243a2e63SVlad Yasevich 	if (br->vlan_enabled == val)
325243a2e63SVlad Yasevich 		goto unlock;
326243a2e63SVlad Yasevich 
327243a2e63SVlad Yasevich 	br->vlan_enabled = val;
328243a2e63SVlad Yasevich 
329243a2e63SVlad Yasevich unlock:
330243a2e63SVlad Yasevich 	rtnl_unlock();
331243a2e63SVlad Yasevich 	return 0;
332243a2e63SVlad Yasevich }
333243a2e63SVlad Yasevich 
3348adff41cSToshiaki Makita /* Must be protected by RTNL.
3358adff41cSToshiaki Makita  * Must be called with vid in range from 1 to 4094 inclusive.
3368adff41cSToshiaki Makita  */
337552406c4SVlad Yasevich int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags)
338243a2e63SVlad Yasevich {
339243a2e63SVlad Yasevich 	struct net_port_vlans *pv = NULL;
340243a2e63SVlad Yasevich 	int err;
341243a2e63SVlad Yasevich 
342243a2e63SVlad Yasevich 	ASSERT_RTNL();
343243a2e63SVlad Yasevich 
344243a2e63SVlad Yasevich 	pv = rtnl_dereference(port->vlan_info);
345243a2e63SVlad Yasevich 	if (pv)
346552406c4SVlad Yasevich 		return __vlan_add(pv, vid, flags);
347243a2e63SVlad Yasevich 
348243a2e63SVlad Yasevich 	/* Create port vlan infomration
349243a2e63SVlad Yasevich 	 */
350243a2e63SVlad Yasevich 	pv = kzalloc(sizeof(*pv), GFP_KERNEL);
351243a2e63SVlad Yasevich 	if (!pv) {
352243a2e63SVlad Yasevich 		err = -ENOMEM;
353243a2e63SVlad Yasevich 		goto clean_up;
354243a2e63SVlad Yasevich 	}
355243a2e63SVlad Yasevich 
356243a2e63SVlad Yasevich 	pv->port_idx = port->port_no;
357243a2e63SVlad Yasevich 	pv->parent.port = port;
358552406c4SVlad Yasevich 	err = __vlan_add(pv, vid, flags);
359243a2e63SVlad Yasevich 	if (err)
360243a2e63SVlad Yasevich 		goto clean_up;
361243a2e63SVlad Yasevich 
362243a2e63SVlad Yasevich 	rcu_assign_pointer(port->vlan_info, pv);
363243a2e63SVlad Yasevich 	return 0;
364243a2e63SVlad Yasevich 
365243a2e63SVlad Yasevich clean_up:
366243a2e63SVlad Yasevich 	kfree(pv);
367243a2e63SVlad Yasevich 	return err;
368243a2e63SVlad Yasevich }
369243a2e63SVlad Yasevich 
3708adff41cSToshiaki Makita /* Must be protected by RTNL.
3718adff41cSToshiaki Makita  * Must be called with vid in range from 1 to 4094 inclusive.
3728adff41cSToshiaki Makita  */
373243a2e63SVlad Yasevich int nbp_vlan_delete(struct net_bridge_port *port, u16 vid)
374243a2e63SVlad Yasevich {
375243a2e63SVlad Yasevich 	struct net_port_vlans *pv;
376243a2e63SVlad Yasevich 
377243a2e63SVlad Yasevich 	ASSERT_RTNL();
378243a2e63SVlad Yasevich 
379243a2e63SVlad Yasevich 	pv = rtnl_dereference(port->vlan_info);
380243a2e63SVlad Yasevich 	if (!pv)
381243a2e63SVlad Yasevich 		return -EINVAL;
382243a2e63SVlad Yasevich 
383bc9a25d2SVlad Yasevich 	spin_lock_bh(&port->br->hash_lock);
384bc9a25d2SVlad Yasevich 	fdb_delete_by_addr(port->br, port->dev->dev_addr, vid);
385bc9a25d2SVlad Yasevich 	spin_unlock_bh(&port->br->hash_lock);
386bc9a25d2SVlad Yasevich 
387243a2e63SVlad Yasevich 	return __vlan_del(pv, vid);
388243a2e63SVlad Yasevich }
389243a2e63SVlad Yasevich 
390243a2e63SVlad Yasevich void nbp_vlan_flush(struct net_bridge_port *port)
391243a2e63SVlad Yasevich {
392243a2e63SVlad Yasevich 	struct net_port_vlans *pv;
393dbbaf949SToshiaki Makita 	u16 vid;
394243a2e63SVlad Yasevich 
395243a2e63SVlad Yasevich 	ASSERT_RTNL();
396243a2e63SVlad Yasevich 
397243a2e63SVlad Yasevich 	pv = rtnl_dereference(port->vlan_info);
398243a2e63SVlad Yasevich 	if (!pv)
399243a2e63SVlad Yasevich 		return;
400243a2e63SVlad Yasevich 
401dbbaf949SToshiaki Makita 	for_each_set_bit(vid, pv->vlan_bitmap, VLAN_N_VID)
402dbbaf949SToshiaki Makita 		vlan_vid_del(port->dev, htons(ETH_P_8021Q), vid);
403dbbaf949SToshiaki Makita 
404243a2e63SVlad Yasevich 	__vlan_flush(pv);
405243a2e63SVlad Yasevich }
406bc9a25d2SVlad Yasevich 
407bc9a25d2SVlad Yasevich bool nbp_vlan_find(struct net_bridge_port *port, u16 vid)
408bc9a25d2SVlad Yasevich {
409bc9a25d2SVlad Yasevich 	struct net_port_vlans *pv;
410bc9a25d2SVlad Yasevich 	bool found = false;
411bc9a25d2SVlad Yasevich 
412bc9a25d2SVlad Yasevich 	rcu_read_lock();
413bc9a25d2SVlad Yasevich 	pv = rcu_dereference(port->vlan_info);
414bc9a25d2SVlad Yasevich 
415bc9a25d2SVlad Yasevich 	if (!pv)
416bc9a25d2SVlad Yasevich 		goto out;
417bc9a25d2SVlad Yasevich 
418bc9a25d2SVlad Yasevich 	if (test_bit(vid, pv->vlan_bitmap))
419bc9a25d2SVlad Yasevich 		found = true;
420bc9a25d2SVlad Yasevich 
421bc9a25d2SVlad Yasevich out:
422bc9a25d2SVlad Yasevich 	rcu_read_unlock();
423bc9a25d2SVlad Yasevich 	return found;
424bc9a25d2SVlad Yasevich }
425