bridge: mdb: reduce the indentation level in br_mdb_fill_info
Switch the port check and skip if it's null, this allows us to reduce one indentation level. Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
6bbd9a05a1
Коммит
76cc173d48
|
@ -88,25 +88,26 @@ static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb,
|
||||||
for (pp = &mp->ports;
|
for (pp = &mp->ports;
|
||||||
(p = rcu_dereference(*pp)) != NULL;
|
(p = rcu_dereference(*pp)) != NULL;
|
||||||
pp = &p->next) {
|
pp = &p->next) {
|
||||||
|
struct br_mdb_entry e;
|
||||||
|
|
||||||
port = p->port;
|
port = p->port;
|
||||||
if (port) {
|
if (!port)
|
||||||
struct br_mdb_entry e;
|
continue;
|
||||||
memset(&e, 0, sizeof(e));
|
memset(&e, 0, sizeof(e));
|
||||||
e.ifindex = port->dev->ifindex;
|
e.ifindex = port->dev->ifindex;
|
||||||
e.vid = p->addr.vid;
|
e.vid = p->addr.vid;
|
||||||
__mdb_entry_fill_flags(&e, p->flags);
|
__mdb_entry_fill_flags(&e, p->flags);
|
||||||
if (p->addr.proto == htons(ETH_P_IP))
|
if (p->addr.proto == htons(ETH_P_IP))
|
||||||
e.addr.u.ip4 = p->addr.u.ip4;
|
e.addr.u.ip4 = p->addr.u.ip4;
|
||||||
#if IS_ENABLED(CONFIG_IPV6)
|
#if IS_ENABLED(CONFIG_IPV6)
|
||||||
if (p->addr.proto == htons(ETH_P_IPV6))
|
if (p->addr.proto == htons(ETH_P_IPV6))
|
||||||
e.addr.u.ip6 = p->addr.u.ip6;
|
e.addr.u.ip6 = p->addr.u.ip6;
|
||||||
#endif
|
#endif
|
||||||
e.addr.proto = p->addr.proto;
|
e.addr.proto = p->addr.proto;
|
||||||
if (nla_put(skb, MDBA_MDB_ENTRY_INFO, sizeof(e), &e)) {
|
if (nla_put(skb, MDBA_MDB_ENTRY_INFO, sizeof(e), &e)) {
|
||||||
nla_nest_cancel(skb, nest2);
|
nla_nest_cancel(skb, nest2);
|
||||||
err = -EMSGSIZE;
|
err = -EMSGSIZE;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
nla_nest_end(skb, nest2);
|
nla_nest_end(skb, nest2);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче