From owner-cvs-src@FreeBSD.ORG Sun Jul 3 01:09:56 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5FEE216AD51; Sun, 3 Jul 2005 00:58:17 +0000 (GMT) (envelope-from ps@mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03FB2445DF; Sun, 3 Jul 2005 00:42:19 +0000 (GMT) (envelope-from ps@mu.org) Received: by elvis.mu.org (Postfix, from userid 1000) id 3EE056DC09; Sat, 2 Jul 2005 17:38:04 -0700 (PDT) X-Original-To: ps@mu.org Delivered-To: ps@mu.org Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by elvis.mu.org (Postfix) with ESMTP id E58275C992 for ; Mon, 24 Jan 2005 12:05:35 -0800 (PST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C6FCB56FED for ; Mon, 24 Jan 2005 20:05:35 +0000 (GMT) (envelope-from owner-src-committers@FreeBSD.org) Received: by hub.freebsd.org (Postfix) id 5108616A540; Mon, 24 Jan 2005 20:05:06 +0000 (GMT) Delivered-To: ps@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 538) id 4BB6316A4D0; Mon, 24 Jan 2005 20:05:05 +0000 (GMT) Delivered-To: src-committers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F38B16A4CE; Mon, 24 Jan 2005 20:05:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2620C43D1F; Mon, 24 Jan 2005 20:05:04 +0000 (GMT) (envelope-from sam@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0OK541B070846; Mon, 24 Jan 2005 20:05:04 GMT (envelope-from sam@repoman.freebsd.org) Received: (from sam@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0OK53wM070845; Mon, 24 Jan 2005 20:05:03 GMT (envelope-from sam) Message-Id: <200501242005.j0OK53wM070845@repoman.freebsd.org> From: Sam Leffler To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Sender: owner-src-committers@FreeBSD.org Precedence: bulk X-Loop: FreeBSD.ORG X-Spam-Checker-Version: SpamAssassin 3.0.1 (2004-10-22) on elvis.mu.org X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.0.1 X-Spam-Level: Cc: Subject: cvs commit: src/sys/dev/ath if_ath.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sun, 03 Jul 2005 01:09:56 -0000 X-Original-Date: Mon, 24 Jan 2005 20:05:03 +0000 (UTC) X-List-Received-Date: Sun, 03 Jul 2005 01:09:56 -0000 sam 2005-01-24 20:05:03 UTC FreeBSD src repository Modified files: sys/dev/ath if_ath.c Log: beacon handling fixups for adhoc mode: o don't reclaim any previous beacon state in ath_beacon_alloc; do it explicitly in ath_newstate o reference count the node held in the beacon frame state block o process ibss merge more intelligently; let the state machine do the right thing instead of explicitly setting the new bssi id o explicitly stop tx dma before doing beacon setup to handle the ibss merge case Revision Changes Path 1.75 +21 -12 src/sys/dev/ath/if_ath.c