From owner-cvs-src@FreeBSD.ORG  Tue Jan 18 20:30:17 2005
Return-Path: <owner-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 0630A16A4CF; Tue, 18 Jan 2005 20:30:17 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id D099C43D54; Tue, 18 Jan 2005 20:30:16 +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 j0IKUGMd078664;
	Tue, 18 Jan 2005 20:30:16 GMT
	(envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0IKUGO7078663;
	Tue, 18 Jan 2005 20:30:16 GMT
	(envelope-from sam)
Message-Id: <200501182030.j0IKUGO7078663@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 18 Jan 2005 20:30:16 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/net80211 ieee80211_node.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Jan 2005 20:30:17 -0000

sam         2005-01-18 20:30:16 UTC

  FreeBSD src repository

  Modified files:
    sys/net80211         ieee80211_node.c 
  Log:
  Explicitly ignore ibss merge requests when the node is ic_bss.  This can
  happen on the first management frame received from a neighbor; we assume
  any merge candidate will send more frames and those should be processed
  with a suitable table entry.
  
  Stepped on by:  Tai-hwa Liang
  
  Revision  Changes    Path
  1.35      +2 -1      src/sys/net80211/ieee80211_node.c