From patchwork Sat Dec 11 04:54:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hillf Danton X-Patchwork-Id: 75165 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 80EB4B70A5 for ; Sat, 11 Dec 2010 15:54:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754338Ab0LKEyO (ORCPT ); Fri, 10 Dec 2010 23:54:14 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:44732 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751738Ab0LKEyM (ORCPT ); Fri, 10 Dec 2010 23:54:12 -0500 Received: by wyb28 with SMTP id 28so4153833wyb.19 for ; Fri, 10 Dec 2010 20:54:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:content-type; bh=UI2ciFhi6No/9hJBB/mMfSTbj5dpQ7y1RKuOVRXcwWc=; b=cYKzn3SQRnNAXdNxeTmR2/YpXCpWM9MkTVUhXLz+1vy/QFnpqC0NdiiM7qtqRPRWnP vKdnliiCTLOlvcQP8wi48xMM/W0hwhpxQE9rafzpQLrvwzEUOSsyTvw0JZKExm5oQZBm yVo55z8MtaBzVzCdMgElx3++FodKLNMFQ+Nxs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=jMeTOoNu95H//DZY/2t4Z1YkF9as16jTcVzaxXwB9fMO2Ymksr+BED0sH+D5YuOl+4 vNaiRuil3d+k+C6fKwHHTWro5NC3VdO8gJbOZqNHObpuPlgc1x731Xh4qO0Jg+/+flO+ spmRu+/gr8kFmyMuMuC11oXjKJw6I7HKIaASA= MIME-Version: 1.0 Received: by 10.216.187.71 with SMTP id x49mr1992217wem.111.1292043251351; Fri, 10 Dec 2010 20:54:11 -0800 (PST) Received: by 10.216.243.67 with HTTP; Fri, 10 Dec 2010 20:54:11 -0800 (PST) Date: Sat, 11 Dec 2010 12:54:11 +0800 Message-ID: Subject: [PATCH] fix bug in Ethernet Channel Bonding Driver From: Hillf Danton To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The returned slave is incorrect, if the net device under check is not charged yet by the master. Signed-off-by: Hillf Danton --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/net/bonding/bonding.h 2010-11-01 19:54:12.000000000 +0800 +++ b/drivers/net/bonding/bonding.h 2010-12-11 12:48:00.000000000 +0800 @@ -273,11 +273,11 @@ static inline struct slave *bond_get_sla bond_for_each_slave(bond, slave, i) { if (slave->dev == slave_dev) { - break; + return slave; } } - return slave; + return 0; } static inline struct bonding *bond_get_bond_by_slave(struct slave *slave)