From owner-svn-src-all@FreeBSD.ORG Fri Feb 11 23:13:21 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BE451065679 for ; Fri, 11 Feb 2011 23:13:21 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id CBB0F8FC14 for ; Fri, 11 Feb 2011 23:13:20 +0000 (UTC) Received: (qmail 19264 invoked by uid 399); 11 Feb 2011 23:13:20 -0000 Received: from localhost (HELO doug-optiplex.ka9q.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 11 Feb 2011 23:13:20 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4D55C28E.6030006@FreeBSD.org> Date: Fri, 11 Feb 2011 15:13:18 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.13) Gecko/20110129 Thunderbird/3.1.7 MIME-Version: 1.0 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201102112308.p1BN8Ym2077220@svn.freebsd.org> In-Reply-To: <201102112308.p1BN8Ym2077220@svn.freebsd.org> X-Enigmail-Version: 1.1.2 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Subject: Re: svn commit: r218587 - head/sys/dev/e1000 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2011 23:13:21 -0000 On 02/11/2011 15:08, Doug Barton wrote: > Author: dougb > Date: Fri Feb 11 23:08:34 2011 > New Revision: 218587 > URL: http://svn.freebsd.org/changeset/base/218587 > > Log: > Restore 2 prototypes that seem to have been mistakenly removed in r218582. > > I've manually twiddled the whitespace for e1000_commit_fc_settings_generic > to match the others in the file. Sorry, I wasn't clear on this. The bit that dim submitted was right, but when I diffed against r218581 I noticed that the ws was different in the previous version. Given that it was going to be a change either way I chose to be consistent rather than doing a straight "revert" to the previous state. Doug > Submitted by: dim > Tested by: me > > Modified: > head/sys/dev/e1000/e1000_api.h > > Modified: head/sys/dev/e1000/e1000_api.h > ============================================================================== > --- head/sys/dev/e1000/e1000_api.h Fri Feb 11 22:57:19 2011 (r218586) > +++ head/sys/dev/e1000/e1000_api.h Fri Feb 11 23:08:34 2011 (r218587) > @@ -120,6 +120,8 @@ s32 e1000_mng_write_cmd_header(struct e > s32 e1000_mng_write_dhcp_info(struct e1000_hw * hw, > u8 *buffer, u16 length); > u32 e1000_translate_register_82542(u32 reg); > +s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw); > +s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw); > > /* > * TBI_ACCEPT macro definition: > -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/