From patchwork Mon Jan 13 20:21:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 3480301 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C94C9C02DC for ; Mon, 13 Jan 2014 20:22:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 090D320160 for ; Mon, 13 Jan 2014 20:22:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C0E12015E for ; Mon, 13 Jan 2014 20:22:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752173AbaAMUW1 (ORCPT ); Mon, 13 Jan 2014 15:22:27 -0500 Received: from mail-ea0-f174.google.com ([209.85.215.174]:40643 "EHLO mail-ea0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751534AbaAMUWM (ORCPT ); Mon, 13 Jan 2014 15:22:12 -0500 Received: by mail-ea0-f174.google.com with SMTP id b10so3547200eae.33 for ; Mon, 13 Jan 2014 12:22:11 -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:in-reply-to:references; bh=Wdb5/3NsT2CZfJhPUz1Q3OuisdkL/h8wGJsac4x2qW8=; b=VrkAAcSVw8WMaigcn+42di7NDt+91Zr/cnrVZwGSLHRZJMeu1mDdnUJwLRIUvpovBa 1hNRjg2+VeTT2LqyzBqWcIR8Wu2ZvmFFoydEK1E2fibBPEtNhv0mbjHkywmruLuyUbJr CAT34sEq+RfSRJ5VlUZ1VAPvR8uaCmf0iL6N+qI+riFAMvgKHYuptlYh06Nov/+42EmT TypB2nURwhobNTQ/YNHlbZZc8IyHOVBGjt2yFWYz4p77L34VN6joKEVgJ76/NBeAVxEX U0KmM1gBxnksd166O2e+przpZXIXln+dUZnHrmjak5XbDBk1bfh77N+Jj8wMJYuwycYj HnPA== X-Received: by 10.15.54.72 with SMTP id s48mr29590820eew.3.1389644531783; Mon, 13 Jan 2014 12:22:11 -0800 (PST) Received: from localhost.localdomain (89-139-17-131.bb.netvision.net.il. [89.139.17.131]) by mx.google.com with ESMTPSA id 4sm42757579eed.14.2014.01.13.12.22.10 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 Jan 2014 12:22:11 -0800 (PST) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Eliad Peller , Emmanuel Grumbach Subject: [PATCH 07/18] iwlwifi: mvm: fix tx seq_ctrl debug print Date: Mon, 13 Jan 2014 22:21:46 +0200 Message-Id: <1389644517-22807-7-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <52D44A46.4000805@gmail.com> References: <52D44A46.4000805@gmail.com> 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.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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: Eliad Peller Since seq_number is incremented right after using it, so printed seq_ctrl was actually the next one to be used. Fix it by incrementing the seq_number only later, before saving it. Additionally, use the IEEE80211_SEQ_TO_SN macro in order to print the actual sequence number. Signed-off-by: Eliad Peller Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/mvm/tx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c index a4d3bce..90378c2 100644 --- a/drivers/net/wireless/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/iwlwifi/mvm/tx.c @@ -390,7 +390,6 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb, seq_number &= IEEE80211_SCTL_SEQ; hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG); hdr->seq_ctrl |= cpu_to_le16(seq_number); - seq_number += 0x10; is_data_qos = true; is_ampdu = info->flags & IEEE80211_TX_CTL_AMPDU; } @@ -407,13 +406,13 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb, } IWL_DEBUG_TX(mvm, "TX to [%d|%d] Q:%d - seq: 0x%x\n", mvmsta->sta_id, - tid, txq_id, seq_number); + tid, txq_id, IEEE80211_SEQ_TO_SN(seq_number)); if (iwl_trans_tx(mvm->trans, skb, dev_cmd, txq_id)) goto drop_unlock_sta; if (is_data_qos && !ieee80211_has_morefrags(fc)) - mvmsta->tid_data[tid].seq_number = seq_number; + mvmsta->tid_data[tid].seq_number = seq_number + 0x10; spin_unlock(&mvmsta->lock);