From patchwork Tue Jun 28 22:03:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lamparter X-Patchwork-Id: 102491 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 CA18FB6F72 for ; Wed, 29 Jun 2011 08:04:08 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752647Ab1F1WDu (ORCPT ); Tue, 28 Jun 2011 18:03:50 -0400 Received: from spaceboyz.net ([87.106.131.203]:37239 "EHLO spaceboyz.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752401Ab1F1WDr (ORCPT ); Tue, 28 Jun 2011 18:03:47 -0400 Received: from [2001:8d8:81:5c2::] (helo=jupiter.n2.diac24.net) by spaceboyz.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1QbgNk-0005br-JN; Wed, 29 Jun 2011 00:03:44 +0200 Received: from arkology.n2.diac24.net ([2001:8d8:81:5c2:219:dbff:feea:a8a8]) by jupiter.n2.diac24.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1QbgNf-00AWLE-2G; Wed, 29 Jun 2011 00:03:41 +0200 Received: from equinox by arkology.n2.diac24.net with local (Exim 4.73) (envelope-from ) id 1QbgNe-0002wI-Up; Wed, 29 Jun 2011 00:03:38 +0200 From: David Lamparter To: netdev@vger.kernel.org Cc: Nick Carter , David Lamparter , Stephen Hemminger , davem@davemloft.net Subject: [PATCH 1/2] bridge: ignore pause & bonding frames Date: Wed, 29 Jun 2011 00:03:18 +0200 Message-Id: <1309298599-11266-1-git-send-email-equinox@diac24.net> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <20110628214637.GE2121496@jupiter.n2.diac24.net> References: <20110628214637.GE2121496@jupiter.n2.diac24.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org this patch adds bonding frames to the special treatment party and has both pause and bonding frames delivered on the underlying bridge member device. we thus become 802.1AX section 5.2.1 compliant which quite clearly has the link aggregation directly on top of the MAC layer, below any bridging. the matching is changed to mimic hardware switches, which match 802.3x/pause and 802.3ad/lacp by the hardware address (keep in mind the existence of LLC/SNAP headers). Signed-off-by: David Lamparter --- note: this should actually fix some issues i was having with bridging screwing up my bonding. i've resolved those by "brouting" LACP frames in ebtables... (which this patch will also result in) compile-tested only net/bridge/br_input.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index f3ac1e8..c873db5 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -160,9 +160,12 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb) p = br_port_get_rcu(skb->dev); if (unlikely(is_link_local(dest))) { - /* Pause frames shouldn't be passed up by driver anyway */ - if (skb->protocol == htons(ETH_P_PAUSE)) - goto drop; + /* Pause/3x frames shouldn't be passed up by driver anyway + * LACP/3ad can never be allowed to cross even a dumb hub + * + * both are usually matched by group address */ + if (dest[5] == 0x01 || dest[5] == 0x02) + return RX_HANDLER_PASS; /* If STP is turned off, then forward */ if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0)