From patchwork Thu Aug 11 14:17:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 1057412 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7BEHtmB023311 for ; Thu, 11 Aug 2011 14:17:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751875Ab1HKORx (ORCPT ); Thu, 11 Aug 2011 10:17:53 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:58575 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751725Ab1HKORx (ORCPT ); Thu, 11 Aug 2011 10:17:53 -0400 Received: by fxh19 with SMTP id 19so1694353fxh.19 for ; Thu, 11 Aug 2011 07:17:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=vtXe908fXkxL0NxLoPhdpdj5tOaiR5u6QA4nvNZSWTw=; b=SvjsSXnENGf6rSO5bhU5FrmgPcHAYvvtVnhqt15Xugg354wQmbLfDU22u1TB8b69W1 DYBeTPCmt4EvLs0hjbnWUpiRRRWGHm6k0HWd1uOj/LL34IAb2xC/h99IhDveaxmRCwxs rzKNSEFDVC9latUjbRiWXu0V+iLEu3EhrE4J8= Received: by 10.223.68.136 with SMTP id v8mr5513867fai.54.1313072272005; Thu, 11 Aug 2011 07:17:52 -0700 (PDT) Received: from localhost.localdomain (port-92-198-130-130.static.qsc.de [92.198.130.130]) by mx.google.com with ESMTPS id g16sm878580faa.3.2011.08.11.07.17.50 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Aug 2011 07:17:51 -0700 (PDT) From: Helmut Schaa To: John Linville Cc: linux-wireless@vger.kernel.org, Johannes Berg , Helmut Schaa Subject: [PATCH 1/2] wireless: Introduce defines for BAR TID_INFO & MULTI_TID fields Date: Thu, 11 Aug 2011 16:17:41 +0200 Message-Id: <1313072262-25413-1-git-send-email-helmut.schaa@googlemail.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1313053697-19544-1-git-send-email-helmut.schaa@googlemail.com> References: <1313053697-19544-1-git-send-email-helmut.schaa@googlemail.com> 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 (demeter2.kernel.org [140.211.167.43]); Thu, 11 Aug 2011 14:17:55 +0000 (UTC) While at it also fix the indention of the other IEEE80211_BAR_CTRL_ defines. Signed-off-by: Helmut Schaa --- include/linux/ieee80211.h | 8 +++++--- net/mac80211/agg-tx.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 54c8789..5286de5 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -816,9 +816,11 @@ struct ieee80211_bar { } __attribute__((packed)); /* 802.11 BAR control masks */ -#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL 0x0000 -#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA 0x0004 - +#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL 0x0000 +#define IEEE80211_BAR_CTRL_MULTI_TID 0x0002 +#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA 0x0004 +#define IEEE80211_BAR_CTRL_TID_INFO_MASK 0xf000 +#define IEEE80211_BAR_CTRL_TID_INFO_SHIFT 12 #define IEEE80211_HT_MCS_MASK_LEN 10 diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index b7075f3..018108d 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -128,7 +128,7 @@ void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u1 memcpy(bar->ta, sdata->vif.addr, ETH_ALEN); bar_control |= (u16)IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL; bar_control |= (u16)IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA; - bar_control |= (u16)(tid << 12); + bar_control |= (u16)(tid << IEEE80211_BAR_CTRL_TID_INFO_SHIFT); bar->control = cpu_to_le16(bar_control); bar->start_seq_num = cpu_to_le16(ssn);