From patchwork Tue Jun 28 22:03:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2] bridge: ignore pause & bonding frames Date: Tue, 28 Jun 2011 12:03:18 -0000 From: David Lamparter X-Patchwork-Id: 102491 Message-Id: <1309298599-11266-1-git-send-email-equinox@diac24.net> To: netdev@vger.kernel.org Cc: Nick Carter , David Lamparter , Stephen Hemminger , davem@davemloft.net 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)