From owner-p4-projects@FreeBSD.ORG Tue May 6 04:01:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE7CC1065670; Tue, 6 May 2008 04:01:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE5EF106564A for ; Tue, 6 May 2008 04:01:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A52898FC0A for ; Tue, 6 May 2008 04:01:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m46412xu099119 for ; Tue, 6 May 2008 04:01:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m46412k7099117 for perforce@freebsd.org; Tue, 6 May 2008 04:01:02 GMT (envelope-from sam@freebsd.org) Date: Tue, 6 May 2008 04:01:02 GMT Message-Id: <200805060401.m46412k7099117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 141226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2008 04:01:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=141226 Change 141226 by sam@sam_ebb on 2008/05/06 04:00:11 Bring in old fix; when forming ADDBA request use the starting seq# from the state block so a BA stream starts off with the expected seq#. We carefully do this after calling back into the driver so it has a chance to fillin this value as it may have to come out of the device (in case it's handling BA's). Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#22 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#22 (text+ko) ==== @@ -1651,9 +1651,6 @@ | SM(IEEE80211_AGGR_BAWMAX, IEEE80211_BAPS_BUFSIZ) ; args[2] = 0; /* batimeout */ - args[3] = SM(0, IEEE80211_BASEQ_START) - | SM(0, IEEE80211_BASEQ_FRAG) - ; /* NB: do first so there's no race against reply */ if (!ic->ic_addba_request(ni, tap, dialogtoken, args[1], args[2])) { /* unable to setup state, don't make request */ @@ -1668,6 +1665,10 @@ return 0; } tokens = dialogtoken; /* allocate token */ + /* NB: after calling ic_addba_request so driver can set seqstart */ + args[3] = SM(tap->txa_seqstart, IEEE80211_BASEQ_START) + | SM(0, IEEE80211_BASEQ_FRAG) + ; return ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, IEEE80211_ACTION_BA_ADDBA_REQUEST, args); }