summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-10-14 10:00:27 -0400
committerDavid S. Miller <davem@davemloft.net>2016-10-14 10:00:27 -0400
commit8eed1cd4cd0c6f41d40c345265f20dc7688ffcca (patch)
tree5adaacccdc1e519e3861b8f7333f39350205a472 /net/bridge
parent687d911466774808ed4926edadb20cc4f0153bed (diff)
parent29fbff8698fc0ac1a1d74584b258e0bf18b469f9 (diff)
downloadlinux-0-day-8eed1cd4cd0c6f41d40c345265f20dc7688ffcca.tar.gz
linux-0-day-8eed1cd4cd0c6f41d40c345265f20dc7688ffcca.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_sysfs_if.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index e657258e1f2cd..8bd569695e76f 100644
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -217,6 +217,7 @@ static const struct brport_attribute *brport_attrs[] = {
#endif
&brport_attr_proxyarp,
&brport_attr_proxyarp_wifi,
+ &brport_attr_multicast_flood,
NULL
};