Merge branch 'hugepage-fallbacks' (hugepatch patches from David Rientjes)

[linux-2.6-block.git] / net / bridge / br_vlan.c

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index f5b2aeebbfe98d82a084c78be2747a14ebcbc938..bb98984cd27d0edb68243f8ee6a027dfddc0861d 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -1281,6 +1281,8 @@ int br_vlan_get_info(const struct net_device *dev, u16 vid,
 
        p_vinfo->vid = vid;
        p_vinfo->flags = v->flags;
+       if (vid == br_get_pvid(vg))
+               p_vinfo->flags |= BRIDGE_VLAN_INFO_PVID;
        return 0;
 }
 EXPORT_SYMBOL_GPL(br_vlan_get_info);