Merge branch 'for-3.17/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / net / bridge / br_fdb.c

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 0bb9d8b63dd2282ff62d9c292e4edac6af88d4f0..6f6c95cfe8f20958ce0d14522526a478549264ef 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -629,7 +629,7 @@ static int fdb_fill_info(struct sk_buff *skb, const struct net_bridge *br,
        if (nla_put(skb, NDA_CACHEINFO, sizeof(ci), &ci))
                goto nla_put_failure;
 
-       if (nla_put(skb, NDA_VLAN, sizeof(u16), &fdb->vlan_id))
+       if (fdb->vlan_id && nla_put(skb, NDA_VLAN, sizeof(u16), &fdb->vlan_id))
                goto nla_put_failure;
 
        return nlmsg_end(skb, nlh);