Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09d7cf7d authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

bridge: Correctly encode addresses when dumping mdb entries 



When dumping mdb table, set the addresses the kernel returns
based on the address protocol type.

Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
Acked-by: default avatarCong Wang <amwang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63233159

net/bridge/br_mdb.c

+4 −2
Original line number Diff line number Diff line
@@ -84,8 +84,10 @@ 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;

					if (p->addr.proto == htons(ETH_P_IP))

						e.addr.u.ip4 = p->addr.u.ip4;

#if IS_ENABLED(CONFIG_IPV6)

					if (p->addr.proto == htons(ETH_P_IPV6))

						e.addr.u.ip6 = p->addr.u.ip6;

#endif

					e.addr.proto = p->addr.proto;