From patchwork Fri Jan 21 03:00:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujith Manoharan X-Patchwork-Id: 493621 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 p0L314rR004742 for ; Fri, 21 Jan 2011 03:01:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752057Ab1AUDBD (ORCPT ); Thu, 20 Jan 2011 22:01:03 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:40518 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751103Ab1AUDBB (ORCPT ); Thu, 20 Jan 2011 22:01:01 -0500 Received: by mail-iw0-f174.google.com with SMTP id 9so1249489iwn.19 for ; Thu, 20 Jan 2011 19:01:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:mime-version:content-type :content-transfer-encoding:message-id:date:to:x-mailer:cc:subject; bh=aPSm9xeh3r1KiO/qSUdfMaYfXlTKGWfphoUOH7RF73A=; b=ecgfV+i2cl3oWCqyF9g+NCoU+HfPfA5HjzRrCWPBip54qC+xYXnKdPPcBF4kb1O8MO JNVordV7t1KZ8Ebt70yXwV4nip8KwyyxT+95S6H9Mghl0a/dEswgunfefcCgLG245W+k TNBAwRDDNPIoInlTO+tglYmDZHNFzlrRDo/BM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:mime-version:content-type:content-transfer-encoding:message-id :date:to:x-mailer:cc:subject; b=Fyhg4AsM5Z+XlRIKSC9OmrfRRPWBBTOUU6u9HWETvxWBJn09Ii3x0ZlhLfWCMKWhMS jv0Wshj195DwKxh4CFcykYX1HItsVCnu4SlgaMC1ZJEyDgJHjNAnfVdyrjv60d2U3ZsC KbYv4tjGEHvbKdSNccmOUFSTdCy1G+dY79Gi8= Received: by 10.42.179.137 with SMTP id bq9mr69156icb.384.1295578861493; Thu, 20 Jan 2011 19:01:01 -0800 (PST) Received: from bodhi ([117.205.82.212]) by mx.google.com with ESMTPS id k38sm6630413ick.9.2011.01.20.19.00.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 20 Jan 2011 19:01:00 -0800 (PST) From: Sujith MIME-Version: 1.0 Message-ID: <19768.63167.685562.673891@gargle.gargle.HOWL> Date: Fri, 21 Jan 2011 08:30:15 +0530 To: linux-wireless@vger.kernel.org X-Mailer: VM 8.1.1 under 23.2.1 (x86_64-unknown-linux-gnu) CC: ath9k-devel@venema.h4ckr.net Subject: [RFC/WIP 08/33] ath9k_htc: Make sequence number calculation per-VIF 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, 21 Jan 2011 03:01:05 +0000 (UTC) diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 4e646fb..87e2d41 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h @@ -208,6 +208,7 @@ struct ath9k_htc_target_stats { struct ath9k_htc_vif { u8 index; + u16 seq_no; }; struct ath9k_vif_iter_data { @@ -372,7 +373,6 @@ struct ath9k_htc_priv { u16 txpowlimit; u16 nvifs; u16 nstations; - u16 seq_no; u32 bmiss_cnt; bool rearm_ani; bool reconfig_beacon; diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c index 133f628..bbbdd60 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c @@ -207,9 +207,9 @@ void ath9k_htc_swba(struct ath9k_htc_priv *priv, u8 beacon_pending) if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) beacon->data; - priv->seq_no += 0x10; + avp->seq_no += 0x10; hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG); - hdr->seq_ctrl |= cpu_to_le16(priv->seq_no); + hdr->seq_ctrl |= cpu_to_le16(avp->seq_no); } tx_ctl.type = ATH9K_HTC_NORMAL;