From patchwork Mon Apr 8 18:06:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Pedersen X-Patchwork-Id: 2410721 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 687873FC71 for ; Mon, 8 Apr 2013 18:07:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934838Ab3DHSHz (ORCPT ); Mon, 8 Apr 2013 14:07:55 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:53284 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934675Ab3DHSHy (ORCPT ); Mon, 8 Apr 2013 14:07:54 -0400 Received: by mail-pa0-f41.google.com with SMTP id kx1so3394622pab.0 for ; Mon, 08 Apr 2013 11:07:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=Vfq/WGYmw82eRMcJgroDYbJwL3/gHfqWevU0t5589a4=; b=jnbx/a86r4aJaiVUTzq+eByEJ50tHGy1kTzWH7qHIthhYM2sREbIHpXtr+Zy+z3uAo G2pVgNLO00wTzeUjBuN2XaZMUNn658jnjrmbdehs1kSciEZw3xZAV2SzQHNozAkvAU8b xtRNd6ilgJatuspSIfjk2d/ZGm2yn+qdiqwgZiS2S0Y3YLDvdhYGsIMlBtLGhUtzp3cK puKYuB/NLwf3Fxj9/3HMamjfYM6El8RJZRn2ahj9s+yE9r7E1kmXoyW72L5KSOPYnrbw bAiocDzvmHEtg1tEIigES2PhADYuUvEU0THt/TGNuFb4NFaWbHXPV4Utm6fK7mcepWtd zknQ== X-Received: by 10.66.176.205 with SMTP id ck13mr39613741pac.50.1365444473267; Mon, 08 Apr 2013 11:07:53 -0700 (PDT) Received: from cable.lan (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPS id pa2sm40603095pac.9.2013.04.08.11.07.51 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Apr 2013 11:07:52 -0700 (PDT) From: Thomas Pedersen To: Johannes Berg Cc: linux-wirelss , open80211s , Thomas Pedersen Subject: [PATCH 2/6] mac80211: exclude multicast frames from BA accounting Date: Mon, 8 Apr 2013 11:06:13 -0700 Message-Id: <1365444377-9959-2-git-send-email-thomas@cozybit.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1365444377-9959-1-git-send-email-thomas@cozybit.com> References: <1365444377-9959-1-git-send-email-thomas@cozybit.com> X-Gm-Message-State: ALoCoQkE8frphyGN3ial4RFEKWRRurwiZ3gxboaVqAPW5LIkakdHM0NiL7TxGRNP4Af3F1JrHUbj Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Since multicast aggregation is not currently supported by mac80211, we can safely ignore them when reordering aggregate MPDUs. This fixes a bug where the expected sequence number might be reset after processing a multicast frame from a STA with an established aggregation session. The expected sequence number would then be incorrect and all aggregated frames until the sequence number rolled over would be dropped. Signed-off-by: Thomas Pedersen --- net/mac80211/rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 5168f89..cb55ef0 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -864,7 +864,8 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx, u16 sc; u8 tid, ack_policy; - if (!ieee80211_is_data_qos(hdr->frame_control)) + if (!ieee80211_is_data_qos(hdr->frame_control) || + is_multicast_ether_addr(hdr->addr1)) goto dont_reorder; /*