From patchwork Thu Apr 21 18:47:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Bohac X-Patchwork-Id: 92436 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 ACFF01007DA for ; Fri, 22 Apr 2011 04:47:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752796Ab1DUSry (ORCPT ); Thu, 21 Apr 2011 14:47:54 -0400 Received: from cantor.suse.de ([195.135.220.2]:60170 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752779Ab1DUSrx (ORCPT ); Thu, 21 Apr 2011 14:47:53 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id BB2E29417A; Thu, 21 Apr 2011 20:47:49 +0200 (CEST) Date: Thu, 21 Apr 2011 20:47:48 +0200 From: Jiri Bohac To: netdev@vger.kernel.org Cc: Stephen Hemminger , Jay Vosburgh , Andy Gospodarek , Benjamin Poirier Subject: [PATCH] bonding: fix bridged bonds in 802.3ad mode Message-ID: <20110421184748.GD23756@midget.suse.cz> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 802.3ad bonding inside a bridge is broken again. Originally fixed by 43aa1920117801fe9ae3d1fad886b62511e09bee, the bug was re-introduced by 1e253c3b8a1aeed51eef6fc366812f219b97de65. LACP frames must not have their skb->dev changed by the bridging hook. Signed-off-by: Jiri Bohac Acked-by: Stephen Hemminger --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1514,6 +1514,11 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb) memcpy(eth_hdr(skb)->h_dest, bond->dev->dev_addr, ETH_ALEN); } + /* prevent bridging code from mangling and forwarding LACP frames */ + if (bond->params.mode == BOND_MODE_8023AD && + skb->protocol == htons(ETH_P_SLOW)) + return RX_HANDLER_PASS; + return RX_HANDLER_ANOTHER; }