From owner-svn-src-head@FreeBSD.ORG  Wed Aug 24 08:53:34 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5AF6C1065672;
	Wed, 24 Aug 2011 08:53:34 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4B0EC8FC1C;
	Wed, 24 Aug 2011 08:53:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7O8rYG9041436;
	Wed, 24 Aug 2011 08:53:34 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7O8rYQo041434;
	Wed, 24 Aug 2011 08:53:34 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201108240853.p7O8rYQo041434@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 24 Aug 2011 08:53:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225139 - head/sys/net80211
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Aug 2011 08:53:34 -0000

Author: adrian
Date: Wed Aug 24 08:53:33 2011
New Revision: 225139
URL: http://svn.freebsd.org/changeset/base/225139

Log:
  This patch fixes beacon frame sequence number generation. The code
  didn't set a sequence number; it didn't show up earlier because the
  hardware most people use for hostap (ie, AR5212 series stuff) sets the
  sequence numbers up in hardware. Later hardware (AR5416, etc) which
  can do 11n and aggregation require sequence numbers to be generated in
  software.
  
  Submitted by:	paradyse@gmail.com
  Approved by:	re (kib)

Modified:
  head/sys/net80211/ieee80211_output.c

Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c	Wed Aug 24 08:38:44 2011	(r225138)
+++ head/sys/net80211/ieee80211_output.c	Wed Aug 24 08:53:33 2011	(r225139)
@@ -2792,6 +2792,8 @@ ieee80211_beacon_update(struct ieee80211
 	struct ieee80211com *ic = ni->ni_ic;
 	int len_changed = 0;
 	uint16_t capinfo;
+	struct ieee80211_frame *wh;
+	ieee80211_seq seqno;
 
 	IEEE80211_LOCK(ic);
 	/*
@@ -2823,6 +2825,12 @@ ieee80211_beacon_update(struct ieee80211
 		return 1;		/* just assume length changed */
 	}
 
+	wh = mtod(m, struct ieee80211_frame *);
+	seqno = ni->ni_txseqs[IEEE80211_NONQOS_TID]++;
+	*(uint16_t *)&wh->i_seq[0] =
+		htole16(seqno << IEEE80211_SEQ_SEQ_SHIFT);
+	M_SEQNO_SET(m, seqno);
+
 	/* XXX faster to recalculate entirely or just changes? */
 	capinfo = ieee80211_getcapinfo(vap, ni->ni_chan);
 	*bo->bo_caps = htole16(capinfo);