diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-01-29 21:33:04 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-29 21:35:40 -0800 |
| commit | 4e146def5855bea30ab14d2a27c13be90b7cd2d1 (patch) | |
| tree | c3dd76a3ea175d046dee4a7c4bd59a59d2c6d216 | |
| parent | 56435d9145f5b97decca66244d2049e2d5e4616d (diff) | |
| parent | 1e16f382ae0ba0a244ebeea5783153f5c4f7e6c1 (diff) | |
Merge branch 'net-bridge-drop-hosts-limit-sysfs-and-add-a-comment'
Nikolay Aleksandrov says:
====================
net: bridge: drop hosts limit sysfs and add a comment
As recently discussed[1] we should stop extending the bridge sysfs
support for new options and move to using netlink only, so patch 01
drops the recently added hosts limit sysfs support which is still in
net-next only and patch 02 adds comments in br_sysfs_br/if.c to warn
against adding new sysfs options.
[1] https://lore.kernel.org/netdev/20210128105201.7c6bed82@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com/T/#mda7265b2e57b52bdab863f286efa85291cf83822
====================
Link: https://lore.kernel.org/r/20210129115142.188455-2-razor@blackwall.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/bridge/br_sysfs_br.c | 4 | ||||
| -rw-r--r-- | net/bridge/br_sysfs_if.c | 30 |
2 files changed, 8 insertions, 26 deletions
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index 7db06e3f642a..71f0f671c4ef 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c @@ -19,6 +19,10 @@ #include "br_private.h" +/* IMPORTANT: new bridge options must be added with netlink support only + * please do not add new sysfs entries + */ + #define to_bridge(cd) ((struct net_bridge *)netdev_priv(to_net_dev(cd))) /* diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index b66305fae26b..96ff63cde1be 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c @@ -16,7 +16,10 @@ #include <linux/sched/signal.h> #include "br_private.h" -#include "br_private_mcast_eht.h" + +/* IMPORTANT: new bridge port options must be added with netlink support only + * please do not add new sysfs entries + */ struct brport_attribute { struct attribute attr; @@ -246,29 +249,6 @@ static int store_multicast_router(struct net_bridge_port *p, static BRPORT_ATTR(multicast_router, 0644, show_multicast_router, store_multicast_router); -static ssize_t show_multicast_eht_hosts_limit(struct net_bridge_port *p, - char *buf) -{ - return sprintf(buf, "%u\n", p->multicast_eht_hosts_limit); -} - -static int store_multicast_eht_hosts_limit(struct net_bridge_port *p, - unsigned long v) -{ - return br_multicast_eht_set_hosts_limit(p, v); -} -static BRPORT_ATTR(multicast_eht_hosts_limit, 0644, - show_multicast_eht_hosts_limit, - store_multicast_eht_hosts_limit); - -static ssize_t show_multicast_eht_hosts_cnt(struct net_bridge_port *p, - char *buf) -{ - return sprintf(buf, "%u\n", p->multicast_eht_hosts_cnt); -} -static BRPORT_ATTR(multicast_eht_hosts_cnt, 0444, show_multicast_eht_hosts_cnt, - NULL); - BRPORT_ATTR_FLAG(multicast_fast_leave, BR_MULTICAST_FAST_LEAVE); BRPORT_ATTR_FLAG(multicast_to_unicast, BR_MULTICAST_TO_UNICAST); #endif @@ -298,8 +278,6 @@ static const struct brport_attribute *brport_attrs[] = { &brport_attr_multicast_router, &brport_attr_multicast_fast_leave, &brport_attr_multicast_to_unicast, - &brport_attr_multicast_eht_hosts_limit, - &brport_attr_multicast_eht_hosts_cnt, #endif &brport_attr_proxyarp, &brport_attr_proxyarp_wifi, |