From owner-cvs-all@FreeBSD.ORG  Sat Aug 27 01:17:43 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 11D9116A41F;
	Sat, 27 Aug 2005 01:17:43 +0000 (GMT)
	(envelope-from thompsa@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DA3CD43D5C;
	Sat, 27 Aug 2005 01:17:42 +0000 (GMT)
	(envelope-from thompsa@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 j7R1HgQk003980;
	Sat, 27 Aug 2005 01:17:42 GMT
	(envelope-from thompsa@repoman.freebsd.org)
Received: (from thompsa@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7R1Hgkw003979;
	Sat, 27 Aug 2005 01:17:42 GMT (envelope-from thompsa)
Message-Id: <200508270117.j7R1Hgkw003979@repoman.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Sat, 27 Aug 2005 01:17:42 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/net if_bridge.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Aug 2005 01:17:43 -0000

thompsa     2005-08-27 01:17:42 UTC

  FreeBSD src repository

  Modified files:
    sys/net              if_bridge.c 
  Log:
  Fix a panic in softclock() if the interface is destroyed with a bpf consumer
  attached.
  
  This is caused by bpf_detachd clearing IFF_PROMISC on the interface which does
  a SIOCSIFFLAGS ioctl. The problem here is that while the interface has been
  stopped, IFF_UP has not been cleared so IFF_UP != IFF_DRV_RUNNING, this causes
  the ioctl function to init() the interface which resets the callouts.
  
  The destroy then completes and frees the softc but softclock will panic on a
  dead callout pointer.
  
  Ensure ifp->if_flags matches reality by clearing IFF_UP when we destroy.
  
  Silence from:   rwatson
  Approved by:    mlaier (mentor)
  MFC after:      3 days
  
  Revision  Changes    Path
  1.20      +1 -0      src/sys/net/if_bridge.c