korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 13:14:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: bridge: add support for host l2 mdb entries

Browse Source 
This patch expands on the earlier work on layer-2 mdb entries by adding
support for host entries.  Due to the fact that host joined entries do
not have any flag field, we infer the permanent flag when reporting the
entries to userspace, which otherwise would be listed as 'temp'.

Before patch:

    ~# bridge mdb add dev br0 port br0 grp 01:00:00:c0:ff:ee permanent
    Error: bridge: Flags are not allowed for host groups.
    ~# bridge mdb add dev br0 port br0 grp 01:00:00:c0:ff:ee
    Error: bridge: Only permanent L2 entries allowed.

After patch:

    ~# bridge mdb add dev br0 port br0 grp 01:00:00:c0:ff:ee permanent
    ~# bridge mdb show
    dev br0 port br0 grp 01:00:00:c0:ff:ee permanent vid 1

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Joachim Wiberg 2022-04-11 10:40:53 +02:00 committed by Paolo Abeni
parent ac6bef064f
commit e65693b017
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/bridge/br_mdb.c
View File

@ -251,14 +251,16 @@ static int __mdb_fill_info(struct sk_buff *skb,
__mdb_entry_fill_flags(&e, flags); __mdb_entry_fill_flags(&e, flags);
e.ifindex = ifindex; e.ifindex = ifindex;
e.vid = mp->addr.vid; e.vid = mp->addr.vid;
if (mp->addr.proto == htons(ETH_P_IP)) if (mp->addr.proto == htons(ETH_P_IP)) {
e.addr.u.ip4 = mp->addr.dst.ip4; e.addr.u.ip4 = mp->addr.dst.ip4;
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
else if (mp->addr.proto == htons(ETH_P_IPV6)) } else if (mp->addr.proto == htons(ETH_P_IPV6)) {
e.addr.u.ip6 = mp->addr.dst.ip6; e.addr.u.ip6 = mp->addr.dst.ip6;
#endif #endif
else } else {
ether_addr_copy(e.addr.u.mac_addr, mp->addr.dst.mac_addr); ether_addr_copy(e.addr.u.mac_addr, mp->addr.dst.mac_addr);
e.state = MDB_PG_FLAGS_PERMANENT;
}
e.addr.proto = mp->addr.proto; e.addr.proto = mp->addr.proto;
nest_ent = nla_nest_start_noflag(skb, nest_ent = nla_nest_start_noflag(skb,
MDBA_MDB_ENTRY_INFO); MDBA_MDB_ENTRY_INFO);
@ -873,8 +875,8 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
return -EINVAL; return -EINVAL;
/* host join errors which can happen before creating the group */ /* host join errors which can happen before creating the group */
if (!port) { if (!port && !br_group_is_l2(&group)) {
/* don't allow any flags for host-joined groups */ /* don't allow any flags for host-joined IP groups */
if (entry->state) { if (entry->state) {
NL_SET_ERR_MSG_MOD(extack, "Flags are not allowed for host groups"); NL_SET_ERR_MSG_MOD(extack, "Flags are not allowed for host groups");
return -EINVAL; return -EINVAL;