From owner-svn-src-all@FreeBSD.ORG  Thu Jun 10 20:58:34 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 681A71065675;
	Thu, 10 Jun 2010 20:58:34 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 572B28FC17;
	Thu, 10 Jun 2010 20:58:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5AKwYqF063823;
	Thu, 10 Jun 2010 20:58:34 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5AKwYma063821;
	Thu, 10 Jun 2010 20:58:34 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201006102058.o5AKwYma063821@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 10 Jun 2010 20:58: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: r209016 - head/sys/net80211
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Jun 2010 20:58:34 -0000

Author: rpaulo
Date: Thu Jun 10 20:58:34 2010
New Revision: 209016
URL: http://svn.freebsd.org/changeset/base/209016

Log:
  Some odd APs send beacons on the same TX queue as non-beacons. This breaks
  802.11 duplicate detection. Upon looking at the standard, we discover
  that 802.11-2007 says:
  "A receiving QoS STA is also required to keep only the most recent
  cache entry per<Address 2, TID, sequence-number>  triple, storing only
  the most recently received fragment number for that triple. A receiving
  STA may omit tuples obtained from broadcast/multicast or ATIM frames
  from the cache."
  
  To fix this, we just disable duplicate detection for multicast/broadcast
  frames.
  
  Reviewed by:	sam
  MFC after:	4 weeks
  Obtained from:	DragonFly

Modified:
  head/sys/net80211/ieee80211_sta.c

Modified: head/sys/net80211/ieee80211_sta.c
==============================================================================
--- head/sys/net80211/ieee80211_sta.c	Thu Jun 10 20:54:53 2010	(r209015)
+++ head/sys/net80211/ieee80211_sta.c	Thu Jun 10 20:58:34 2010	(r209016)
@@ -584,7 +584,7 @@ sta_input(struct ieee80211_node *ni, str
 		}
 		IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
 		ni->ni_noise = nf;
-		if (HAS_SEQ(type)) {
+		if (HAS_SEQ(type) !IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 			uint8_t tid = ieee80211_gettid(wh);
 			if (IEEE80211_QOS_HAS_SEQ(wh) &&
 			    TID_TO_WME_AC(tid) >= WME_AC_VI)