From mboxrd@z Thu Jan 1 00:00:00 1970 From: sfeldma@gmail.com Subject: [PATCH net-next v4 11/24] bonding: cut over to new swdev_port_bridge_setlink Date: Sun, 12 Apr 2015 23:17:05 -0700 Message-ID: <1428905838-14920-12-git-send-email-sfeldma@gmail.com> References: <1428905838-14920-1-git-send-email-sfeldma@gmail.com> Cc: jiri@resnulli.us, roopa@cumulusnetworks.com, linux@roeck-us.net, f.fainelli@gmail.com, sridhar.samudrala@intel.com, ronen.arad@intel.com, andrew@lunn.ch To: netdev@vger.kernel.org Return-path: Received: from mail-pa0-f42.google.com ([209.85.220.42]:33865 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753014AbbDMGQo (ORCPT ); Mon, 13 Apr 2015 02:16:44 -0400 Received: by pacyx8 with SMTP id yx8so91986554pac.1 for ; Sun, 12 Apr 2015 23:16:44 -0700 (PDT) In-Reply-To: <1428905838-14920-1-git-send-email-sfeldma@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Scott Feldman swdev_port_bridge_setlink knows how to recurse stacked devices, so make it the default bridge_setlink op for bonds. Signed-off-by: Scott Feldman --- drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 78dde56..ef5207c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4037,7 +4037,7 @@ static const struct net_device_ops bond_netdev_ops = { .ndo_add_slave = bond_enslave, .ndo_del_slave = bond_release, .ndo_fix_features = bond_fix_features, - .ndo_bridge_setlink = ndo_dflt_netdev_switch_port_bridge_setlink, + .ndo_bridge_setlink = swdev_port_bridge_setlink, .ndo_bridge_dellink = ndo_dflt_netdev_switch_port_bridge_dellink, .ndo_features_check = passthru_features_check, }; -- 1.7.10.4