From patchwork Mon Apr 13 06:17:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 460676 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B17BF1402F7 for ; Mon, 13 Apr 2015 16:20:06 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=sPmY/wlU; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754258AbbDMGUB (ORCPT ); Mon, 13 Apr 2015 02:20:01 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bF1IJtlix4r8SMR31OJ0EZW/zZqTJgBhv7ThfLbQiNU=; b=sPmY/wlUp8qfpItx1YGD0q/Z3ug4X+qiIp+NqSPb+2dgfNXslQWGh+d1yJliGu4BJD fL6EOa1XZhO2WloaQ/dlKAppj0Ws4dOj10O7ujCV89AklEGa0otZy+NsgYBGiuaJuTIN h5h4AymTgS7ptG1kxX9F21crmHq14pbxDE2+w/jEQLminq28ovlUGHzARX4KXzeCo7Wa 7wz7m2JlEcmHtN1QgJIAypB61yMn7NScbXb7DCibf4BxK1wXi+lQK/xeB/b9LTxlKsaK A5b40BhJXXqmmQCjFHQfU9cZnjbs45F4p8w4FjV1lhvnLmya5XCDvIy3X8/L0O/Qsglk iW0A== X-Received: by 10.70.61.41 with SMTP id m9mr3965105pdr.18.1428905803958; Sun, 12 Apr 2015 23:16:43 -0700 (PDT) Received: from rocker1.home (static-50-53-122-54.bvtn.or.frontiernet.net. [50.53.122.54]) by mx.google.com with ESMTPSA id qc9sm6090095pab.19.2015.04.12.23.16.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Apr 2015 23:16:43 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org 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 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> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1428905838-14920-1-git-send-email-sfeldma@gmail.com> References: <1428905838-14920-1-git-send-email-sfeldma@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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, };