lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 14 Mar 2022 10:52:25 +0100 From: Tobias Waldekranz <tobias@...dekranz.com> To: davem@...emloft.net, kuba@...nel.org Cc: Andrew Lunn <andrew@...n.ch>, Vivien Didelot <vivien.didelot@...il.com>, Florian Fainelli <f.fainelli@...il.com>, Vladimir Oltean <olteanv@...il.com>, Jiri Pirko <jiri@...nulli.us>, Ivan Vecera <ivecera@...hat.com>, Roopa Prabhu <roopa@...dia.com>, Nikolay Aleksandrov <razor@...ckwall.org>, Russell King <linux@...linux.org.uk>, Ido Schimmel <idosch@...dia.com>, Petr Machata <petrm@...dia.com>, Cooper Lees <me@...perlees.com>, Matt Johnston <matt@...econstruct.com.au>, linux-kernel@...r.kernel.org, netdev@...r.kernel.org, bridge@...ts.linux-foundation.org Subject: [PATCH v3 net-next 08/14] net: bridge: mst: Add helper to check if MST is enabled This is useful for switchdev drivers that might want to refuse to join a bridge where MST is enabled, if the hardware can't support it. Signed-off-by: Tobias Waldekranz <tobias@...dekranz.com> --- include/linux/if_bridge.h | 5 +++++ net/bridge/br_mst.c | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index 46e6327fef06..5dbab0a280a6 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -119,6 +119,7 @@ int br_vlan_get_info(const struct net_device *dev, u16 vid, struct bridge_vlan_info *p_vinfo); int br_vlan_get_info_rcu(const struct net_device *dev, u16 vid, struct bridge_vlan_info *p_vinfo); +bool br_mst_enabled(struct net_device *dev); int br_mst_get_info(struct net_device *dev, u16 msti, unsigned long *vids); #else static inline bool br_vlan_enabled(const struct net_device *dev) @@ -152,6 +153,10 @@ static inline int br_vlan_get_info_rcu(const struct net_device *dev, u16 vid, { return -EINVAL; } +static inline bool br_mst_enabled(struct net_device *dev) +{ + return false; +} static inline int br_mst_get_info(struct net_device *dev, u16 msti, unsigned long *vids) { diff --git a/net/bridge/br_mst.c b/net/bridge/br_mst.c index eb18dbd5838f..e5ab2ce451c2 100644 --- a/net/bridge/br_mst.c +++ b/net/bridge/br_mst.c @@ -13,6 +13,15 @@ DEFINE_STATIC_KEY_FALSE(br_mst_used); +bool br_mst_enabled(struct net_device *dev) +{ + if (!netif_is_bridge_master(dev)) + return false; + + return br_opt_get(netdev_priv(dev), BROPT_MST_ENABLED); +} +EXPORT_SYMBOL(br_mst_enabled); + int br_mst_get_info(struct net_device *dev, u16 msti, unsigned long *vids) { struct net_bridge_vlan_group *vg; -- 2.25.1
Powered by blists - more mailing lists