From patchwork Mon Jan 19 04:07:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.chou.nd@gmail.com X-Patchwork-Id: 5654621 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4849FC058D for ; Mon, 19 Jan 2015 04:05:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 28DD920304 for ; Mon, 19 Jan 2015 04:05:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1DC7120254 for ; Mon, 19 Jan 2015 04:05:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751191AbbASEE7 (ORCPT ); Sun, 18 Jan 2015 23:04:59 -0500 Received: from mail-pd0-f177.google.com ([209.85.192.177]:55209 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751090AbbASEE6 (ORCPT ); Sun, 18 Jan 2015 23:04:58 -0500 Received: by mail-pd0-f177.google.com with SMTP id y13so9175971pdi.8 for ; Sun, 18 Jan 2015 20:04:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=UzhANYY8YPsVHw6vlaz1SN1kyxFj3LJAWVuxD3m6nE0=; b=Qut71g1ZWahnnJGju+IC57LeAZvXFvp1D7NRPQbuu1OK+x2qTft2dAxcM9Tx+oGS+o t3yL5M8YCs6+5g1s0Ajpdp19duawPzi2JznE/vICf64GVGBA2pR3N7Y0p2gdbYqDlg4K OkIfwpfq0xBNx8bhr3AbZg+6SrI9KqOOZ7vD9a3mKaPl9eo1KtezaSSEISXLCgwf2vL3 zCvazD/LJjGetfsDM+wreElfL7pU/d/l6SCRHc+npmzOKAfBMDdydDiwlhVE7ZGG4bBV Boyz4MA50WyOb2yBcLaclTSVYrhq8OIPo/Hr2peDoGicFkmo9GiDZ0eA2LeoytGrk2Sq qsTQ== X-Received: by 10.68.57.132 with SMTP id i4mr4102600pbq.165.1421640298578; Sun, 18 Jan 2015 20:04:58 -0800 (PST) Received: from fred-EP43-DS3L.a-star.edu.sg ([192.122.131.10]) by mx.google.com with ESMTPSA id rf7sm10295707pab.3.2015.01.18.20.04.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Jan 2015 20:04:57 -0800 (PST) From: Fred Chou X-Google-Original-From: Fred Chou To: johannes@sipsolutions.net, linux-wireless@vger.kernel.org Cc: Fred Chou Subject: [PATCH] mac80211: correct header length calculation Date: Mon, 19 Jan 2015 12:07:40 +0800 Message-Id: <1421640460-5094-1-git-send-email-fred.chou.nd@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fred Chou HT Control field may also be present in management frames, as defined in 8.2.4.1.10 of 802.11-2012. Account for this in calculation of header length. Signed-off-by: Fred Chou --- net/wireless/util.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/wireless/util.c b/net/wireless/util.c index 1d2fcfa..ce9617c 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -297,6 +297,12 @@ unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc) { unsigned int hdrlen = 24; + if (ieee80211_is_mgmt(fc)) { + if (ieee80211_has_order(fc)) + hdrlen += IEEE80211_HT_CTL_LEN; + goto out; + } + if (ieee80211_is_data(fc)) { if (ieee80211_has_a4(fc)) hdrlen = 30;