diff options
author | Scott Feldman <sfeldma@gmail.com> | 2015-05-10 12:47:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-12 18:43:54 -0400 |
commit | e71f220b342d78cfb8ee9f1b60f1351f7183f2a5 (patch) | |
tree | 1122d8de74af89a7e81f7f495530c338dc34c12a /net/switchdev/switchdev.c | |
parent | fc8f40d8644f15f0fd5fbc49012802a00f36ad55 (diff) |
switchdev: remove old switchdev_port_bridge_setlink
New attr-based bridge_setlink can recurse lower devs and recover on err, so
remove old wrapper (including ndo_dflt_switchdev_port_bridge_setlink).
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/switchdev/switchdev.c')
-rw-r--r-- | net/switchdev/switchdev.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index b01791a9b56d..dcdec9de9137 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c | |||
@@ -537,36 +537,6 @@ int switchdev_port_bridge_dellink(struct net_device *dev, | |||
537 | EXPORT_SYMBOL_GPL(switchdev_port_bridge_dellink); | 537 | EXPORT_SYMBOL_GPL(switchdev_port_bridge_dellink); |
538 | 538 | ||
539 | /** | 539 | /** |
540 | * ndo_dflt_switchdev_port_bridge_setlink - default ndo bridge setlink | ||
541 | * op for master devices | ||
542 | * | ||
543 | * @dev: port device | ||
544 | * @nlh: netlink msg with bridge port attributes | ||
545 | * @flags: bridge setlink flags | ||
546 | * | ||
547 | * Notify master device slaves of bridge port attributes | ||
548 | */ | ||
549 | int ndo_dflt_switchdev_port_bridge_setlink(struct net_device *dev, | ||
550 | struct nlmsghdr *nlh, u16 flags) | ||
551 | { | ||
552 | struct net_device *lower_dev; | ||
553 | struct list_head *iter; | ||
554 | int ret = 0, err = 0; | ||
555 | |||
556 | if (!(dev->features & NETIF_F_HW_SWITCH_OFFLOAD)) | ||
557 | return ret; | ||
558 | |||
559 | netdev_for_each_lower_dev(dev, lower_dev, iter) { | ||
560 | err = switchdev_port_bridge_setlink(lower_dev, nlh, flags); | ||
561 | if (err && err != -EOPNOTSUPP) | ||
562 | ret = err; | ||
563 | } | ||
564 | |||
565 | return ret; | ||
566 | } | ||
567 | EXPORT_SYMBOL_GPL(ndo_dflt_switchdev_port_bridge_setlink); | ||
568 | |||
569 | /** | ||
570 | * ndo_dflt_switchdev_port_bridge_dellink - default ndo bridge dellink | 540 | * ndo_dflt_switchdev_port_bridge_dellink - default ndo bridge dellink |
571 | * op for master devices | 541 | * op for master devices |
572 | * | 542 | * |