If vlan is assigned to a port, notify the port of 4 bytes header length,
or 8 bytes if 802.1ad.
Signed-off-by: Toshiaki Makita <makita.toshi...@lab.ntt.co.jp>
---
net/bridge/br_vlan.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 5f0d0cc..9c678de 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -208,6 +208,8 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)
}
if (p) {
+ int enc_hdr_len;
+
/* Add VLAN to the device filter if it is supported.
* This ensures tagged traffic enters the bridge when
* promiscuous mode is disabled by br_manage_promisc().
@@ -228,6 +230,13 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)
if (!masterv)
goto out_filt;
v->brvlan = masterv;
+
+ if (!vg->num_vlans) {
+ enc_hdr_len = VLAN_HLEN;
+ if (br->vlan_proto == htons(ETH_P_8021AD))
+ enc_hdr_len += VLAN_HLEN;
+ dev_set_enc_hdr_len(dev, enc_hdr_len);
+ }
}
/* Add the dev mac and count the vlan only if it's usable */
@@ -667,6 +676,15 @@ int __br_vlan_set_proto(struct net_bridge *br, __be16
proto)
}
}
+ if (proto == htons(ETH_P_8021AD)) {
+ list_for_each_entry(p, &br->port_list, list) {
+ if (!p->vlgrp->num_vlans)
+ continue;
+
+ dev_set_enc_hdr_len(p->dev, VLAN_HLEN * 2);
+ }
+ }
+
oldproto = br->vlan_proto;
br->vlan_proto = proto;
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
