diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-14 10:00:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-14 10:00:27 -0400 |
| commit | 8eed1cd4cd0c6f41d40c345265f20dc7688ffcca (patch) | |
| tree | 5adaacccdc1e519e3861b8f7333f39350205a472 /net/bridge | |
| parent | 687d911466774808ed4926edadb20cc4f0153bed (diff) | |
| parent | 29fbff8698fc0ac1a1d74584b258e0bf18b469f9 (diff) | |
| download | talos-op-linux-8eed1cd4cd0c6f41d40c345265f20dc7688ffcca.tar.gz talos-op-linux-8eed1cd4cd0c6f41d40c345265f20dc7688ffcca.zip | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index e657258e1f2c..8bd569695e76 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 }; |
