diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-06 05:46:26 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-06 05:46:26 +0400 |
| commit | d247b6ab3ce6dd43665780865ec5fa145d9ab6bd (patch) | |
| tree | 02eb71e4d64b678d7568d2b99f309e08f56ef2fe /net/bridge/br_fdb.c | |
| parent | 30f00847953e3aa3f710d62ffd37b42042807900 (diff) | |
| parent | 4d8fdc95c60e90d84c8257a0067ff4b1729a3757 (diff) | |
| download | linux-d247b6ab3ce6dd43665780865ec5fa145d9ab6bd.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/Makefile
net/ipv6/sysctl_net_ipv6.c
Two ipv6_table_template[] additions overlap, so the index
of the ipv6_table[x] assignments needed to be adjusted.
In the drivers/net/Makefile case, we've gotten rid of the
garbage whereby we had to list every single USB networking
driver in the top-level Makefile, there is just one
"USB_NETWORKING" that guards everything.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_fdb.c')
| -rw-r--r-- | net/bridge/br_fdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 0bb9d8b63dd2..6f6c95cfe8f2 100644 --- 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); |