Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 May 2012 10:00:36 +0000 (UTC)
From:      Bernhard Schmidt <bschmidt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r235686 - head/sys/dev/iwn
Message-ID:  <201205201000.q4KA0aCg081121@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bschmidt
Date: Sun May 20 10:00:36 2012
New Revision: 235686
URL: http://svn.freebsd.org/changeset/base/235686

Log:
  Discard frames after a DELBA which where queued during an active BA
  session.
  
  MFC after:	1 week

Modified:
  head/sys/dev/iwn/if_iwn.c

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Sun May 20 09:46:48 2012	(r235685)
+++ head/sys/dev/iwn/if_iwn.c	Sun May 20 10:00:36 2012	(r235686)
@@ -3314,6 +3314,11 @@ iwn_tx_data(struct iwn_softc *sc, struct
 	if (m->m_flags & M_AMPDU_MPDU) {
 		struct ieee80211_tx_ampdu *tap = &ni->ni_tx_ampdu[ac];
 
+		if (!IEEE80211_AMPDU_RUNNING(tap)) {
+			m_freem(m);
+			return EINVAL;
+		}
+
 		ac = *(int *)tap->txa_private;
 		*(uint16_t *)wh->i_seq =
 		    htole16(ni->ni_txseqs[tid] << IEEE80211_SEQ_SEQ_SHIFT);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205201000.q4KA0aCg081121>