From owner-cvs-src-old@FreeBSD.ORG  Tue Jul 12 13:22:36 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB555106566C
	for <cvs-src-old@freebsd.org>; Tue, 12 Jul 2011 13:22:36 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 578C58FC08
	for <cvs-src-old@freebsd.org>; Tue, 12 Jul 2011 13:22:36 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p6CDMarx067637
	for <cvs-src-old@freebsd.org>; Tue, 12 Jul 2011 13:22:36 GMT
	(envelope-from marius@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p6CDMaAT067636
	for cvs-src-old@freebsd.org; Tue, 12 Jul 2011 13:22:36 GMT
	(envelope-from marius@repoman.freebsd.org)
Message-Id: <201107121322.p6CDMaAT067636@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	marius@repoman.freebsd.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Tue, 12 Jul 2011 13:22:17 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/dev/cas if_cas.c if_casvar.h
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jul 2011 13:22:36 -0000

marius      2011-07-12 13:22:17 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/cas          if_cas.c if_casvar.h 
  Log:
  SVN rev 223951 on 2011-07-12 13:22:17Z by marius
  
  Partially merge r223648, r223648 and r223949 from gem(4):
  - Consistently use the newly introduced sc_mac_rxcfg throughout the driver
    instead of reading the old content of CAS_MAC_RX_CONF.
  - Increment if_iqdrops instead of if_ierrors in case of RX buffer allocation
    failure.
  - According to the Cassini datasheet the RX MAC should also be disabled in
    cas_setladrf() before changing its configuration.
  - Add error messages to gem_disable_{r,t}x() and take advantage of these
    throughout the driver instead of duplicating their functionality all over
    the place.
  
  Revision  Changes    Path
  1.11      +40 -46    src/sys/dev/cas/if_cas.c
  1.4       +2 -0      src/sys/dev/cas/if_casvar.h