From owner-cvs-src@FreeBSD.ORG  Wed Oct  5 22:08:18 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 3FA9516A424;
	Wed,  5 Oct 2005 22:08:18 +0000 (GMT)
	(envelope-from marius@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0F77843D45;
	Wed,  5 Oct 2005 22:08:18 +0000 (GMT)
	(envelope-from marius@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 j95M8Hl5080366;
	Wed, 5 Oct 2005 22:08:17 GMT
	(envelope-from marius@repoman.freebsd.org)
Received: (from marius@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j95M8H4N080365;
	Wed, 5 Oct 2005 22:08:17 GMT (envelope-from marius)
Message-Id: <200510052208.j95M8H4N080365@repoman.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 5 Oct 2005 22:08:17 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/dev/gem if_gem.c if_gem_pci.c if_gemvar.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 05 Oct 2005 22:08:18 -0000

marius      2005-10-05 22:08:17 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/dev/gem          if_gem.c if_gem_pci.c if_gemvar.h 
  Log:
  MFC: if_gem.c 1.31 + 1.35, if_gem_pci.c 1.20, if_gemvar.h 1.11
  
  - In gem_ioctl() move the call to ether_ioctl() to the default case of
    the switch statement in order to make this driver more like other
    Ethernet NIC drivers.
  - In gem_attach() call gem_stop() in addition to gem_reset() to make
    sure the chip actually is stopped and not just reset.
  - In gem_stop() also stop the gem_rint_timeout() callout in case the
    driver is compiled with GEM_RINT_TIMEOUT defined.
  - Remove NOP spl*() calls and add locking (making gem(4) MPSAFE).
  
  This MFC actually brings the RELENG_6 gem(4) in line with HEAD which
  means that it additionally includes a comment update regarding the
  IFF_OACTIVE -> IFF_DRV_OACTIVE rename which was part of if_gem.c 1.33
  but missed in the respective MFC in 1.29.2.2.
  
  Requested by:   thompsa
  Approved by:    re (scottl)
  
  Revision  Changes    Path
  1.29.2.5  +92 -42    src/sys/dev/gem/if_gem.c
  1.19.2.1  +11 -5     src/sys/dev/gem/if_gem_pci.c
  1.10.2.1  +9 -0      src/sys/dev/gem/if_gemvar.h