Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Feb 2011 15:13:18 -0800
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org,  svn-src-head@freebsd.org
Subject:   Re: svn commit: r218587 - head/sys/dev/e1000
Message-ID:  <4D55C28E.6030006@FreeBSD.org>
In-Reply-To: <201102112308.p1BN8Ym2077220@svn.freebsd.org>
References:  <201102112308.p1BN8Ym2077220@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
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/




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4D55C28E.6030006>