From patchwork Fri Apr 1 13:46:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 681221 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p31Dm9vA009235 for ; Fri, 1 Apr 2011 13:48:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756010Ab1DANsG (ORCPT ); Fri, 1 Apr 2011 09:48:06 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:46542 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755913Ab1DANsE (ORCPT ); Fri, 1 Apr 2011 09:48:04 -0400 Received: by bwz15 with SMTP id 15so2534654bwz.19 for ; Fri, 01 Apr 2011 06:48:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=MKD4u8gR5mGctHkr2jF2telyAVRMOjx2uGqEDSvZSnA=; b=iL1kQdsa7LDPJVgeILW3s9RnqKMrZ95u96eocG+/A2HzLfOSjnMT/bdYewtJfir2VM FIcP/4C1x2bPWW2HUKzgs7lP1Opu9EP9asl9NvvgwUClGASSV/aNxL0MqKASNKNFq/F+ ijZ8Yx1ypfLiGFhrv4fjDQAR/adGg4tiMsTOM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=d1CFez5Z4QfwVCX6nx1pR1XVT8gr2YSU/Bh978DGloHkpOk2E/+6cOExF1JFvLf5bR u/l1KnnhzbemryaouvEdGWkZl/clO6+bU+1+DPi7svq2YlyXNo+MS8a6nZbez6oj2Ms7 ltItrJH/2TtjT7IlMvEI6LSxY4GXCUkBsGRfc= Received: by 10.204.141.14 with SMTP id k14mr124430bku.37.1301665682432; Fri, 01 Apr 2011 06:48:02 -0700 (PDT) Received: from localhost.localdomain (p5495B33C.dip.t-dialin.net [84.149.179.60]) by mx.google.com with ESMTPS id q18sm1419734bka.3.2011.04.01.06.48.01 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Apr 2011 06:48:01 -0700 (PDT) From: Helmut Schaa To: John Linville Cc: linux-wireless@vger.kernel.org, Johannes Berg , Helmut Schaa Subject: [PATCH] mac80211: Fix duplicate frames on cooked monitor Date: Fri, 1 Apr 2011 15:46:05 +0200 Message-Id: <1301665565-4616-1-git-send-email-helmut.schaa@googlemail.com> X-Mailer: git-send-email 1.7.3.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 01 Apr 2011 13:48:12 +0000 (UTC) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index d47d33d..32cc8ee 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2545,7 +2545,6 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx) * same TID from the same station */ rx->skb = skb; - rx->flags = 0; CALL_RXH(ieee80211_rx_h_decrypt) CALL_RXH(ieee80211_rx_h_check_more_data) @@ -2616,6 +2615,7 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid) .sdata = sta->sdata, .local = sta->local, .queue = tid, + .flags = 0, }; struct tid_ampdu_rx *tid_agg_rx;