From owner-cvs-src@FreeBSD.ORG  Sun Jul  3 01:02:53 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
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 5302016A7C2;
	Sun,  3 Jul 2005 00:57:23 +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 E060A4416F;
	Sun,  3 Jul 2005 00:38:51 +0000 (GMT) (envelope-from ps@mu.org)
Received: by elvis.mu.org (Postfix, from userid 1000)
	id 82EEB6D982; Sat,  2 Jul 2005 17:37:39 -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 71D815CA0B
	for <ps@mu.org>; Tue, 18 Jan 2005 12:30:37 -0800 (PST)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id 4CD55568D1
	for <ps@mu.org>; Tue, 18 Jan 2005 20:30:37 +0000 (GMT)
	(envelope-from owner-src-committers@FreeBSD.org)
Received: by hub.freebsd.org (Postfix)
	id B2D6416A54F; Tue, 18 Jan 2005 20:30:31 +0000 (GMT)
Delivered-To: ps@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 538)
	id 0095416A4D0; Tue, 18 Jan 2005 20:30:17 +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 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>
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/net80211 ieee80211_node.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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>
Date: Sun, 03 Jul 2005 01:02:55 -0000
X-Original-Date: Tue, 18 Jan 2005 20:30:16 +0000 (UTC)
X-List-Received-Date: Sun, 03 Jul 2005 01:02:55 -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