From patchwork Wed Dec 5 05:38:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krishna Chaitanya X-Patchwork-Id: 1840371 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 9ED5A3FCA5 for ; Wed, 5 Dec 2012 05:38:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751408Ab2LEFii (ORCPT ); Wed, 5 Dec 2012 00:38:38 -0500 Received: from mail-ie0-f174.google.com ([209.85.223.174]:53042 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217Ab2LEFih (ORCPT ); Wed, 5 Dec 2012 00:38:37 -0500 Received: by mail-ie0-f174.google.com with SMTP id c11so7525352ieb.19 for ; Tue, 04 Dec 2012 21:38:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:cc:content-type; bh=A62Kkch0ikf5CLVAe2bPEVTBp+N+qbH87SQ4zEhA0F0=; b=zBn0nZevnYb/3W66HDVPJtVzsMHyNqeYfWV/a/Cf/HsKRbHVsBPLOwMQhWamDR9VIc kFzfWf4ctSItIGu26dnsqpj5byQ616ipK4dC98mH6dI9mAfErVq+IBrhckCqsO4wYEXw lrdCtfS/P172kK+8/86v+enhL3g2QNpXNlJpLUHAD2iddlLLRzd7FswWeK1zVDpcM8Kv rId9oCsTaY6HLeytH6/gMMS90YAb2j4COxuTSBGLPdWR2WC3LC89GQ2Yiv1YLGRaJew9 Q7OFI+kbrFYyFItvYnSQFzd47nzlbqhDUu5aQJRJAW1y4eKC6GQStIKOg0qwfpJcJjr4 Mk3g== Received: by 10.50.153.169 with SMTP id vh9mr652396igb.67.1354685916612; Tue, 04 Dec 2012 21:38:36 -0800 (PST) MIME-Version: 1.0 Received: by 10.64.35.138 with HTTP; Tue, 4 Dec 2012 21:38:16 -0800 (PST) From: Krishna Chaitanya Date: Wed, 5 Dec 2012 11:08:16 +0530 Message-ID: Subject: [PATCH] mac80211: Moving Zero Len subframe reporting under driver capability check. To: johannes@sipsolutions.net Cc: linux-wireless Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Zero Len subframe makes sense only when driver supports the reporting of zero len subframes. Signed-off-by: Chaitanya T K --- net/mac80211/rx.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) if (status->flag & RX_FLAG_AMPDU_IS_LAST) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index db343fa..3f1443b 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -281,10 +281,11 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, cpu_to_le32(1 << IEEE80211_RADIOTAP_AMPDU_STATUS); put_unaligned_le32(status->ampdu_reference, pos); pos += 4; - if (status->flag & RX_FLAG_AMPDU_REPORT_ZEROLEN) + if (status->flag & RX_FLAG_AMPDU_REPORT_ZEROLEN) { flags |= IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN; - if (status->flag & RX_FLAG_AMPDU_IS_ZEROLEN) - flags |= IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN; + if (status->flag & RX_FLAG_AMPDU_IS_ZEROLEN) + flags |= IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN; + } if (status->flag & RX_FLAG_AMPDU_LAST_KNOWN) flags |= IEEE80211_RADIOTAP_AMPDU_LAST_KNOWN;