---

yaml --- r: 347325 b: refs/heads/master c: 09d7cf7 h: refs/heads/master i: 347323: f7708ae v: v3
git-mirror · Dec 19, 2012 · bff6f7c · bff6f7c
1 parent 1fc5feb
commit bff6f7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63233159fd4e596568f5f168ecb0879b61631d47
+refs/heads/master: 09d7cf7d931c627b227decd080f4528d003ddbe6
diff --git a/trunk/net/bridge/br_mdb.c b/trunk/net/bridge/br_mdb.c
@@ -84,9 +84,11 @@ static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb,
 					struct br_mdb_entry e;
 					e.ifindex = port->dev->ifindex;
 					e.state = p->state;
-					e.addr.u.ip4 = p->addr.u.ip4;
+					if (p->addr.proto == htons(ETH_P_IP))
+						e.addr.u.ip4 = p->addr.u.ip4;
 #if IS_ENABLED(CONFIG_IPV6)
-					e.addr.u.ip6 = p->addr.u.ip6;
+					if (p->addr.proto == htons(ETH_P_IPV6))
+						e.addr.u.ip6 = p->addr.u.ip6;
 #endif
 					e.addr.proto = p->addr.proto;
 					if (nla_put(skb, MDBA_MDB_ENTRY_INFO, sizeof(e), &e)) {