Re: svn commit: r218581 - head/sys/dev/e1000

2011-02-11 Thread Doug Barton

On 02/11/2011 09:18, Jack F Vogel wrote:

Modified: head/sys/dev/e1000/e1000_mac.h
==
--- head/sys/dev/e1000/e1000_mac.h  Fri Feb 11 16:14:16 2011
(r218580)
+++ head/sys/dev/e1000/e1000_mac.h  Fri Feb 11 17:18:42 2011
(r218581)
@@ -70,6 +70,7 @@ s32  e1000_led_on_generic(struct e1000_h
  s32  e1000_led_off_generic(struct e1000_hw *hw);
  void e1000_update_mc_addr_list_generic(struct e1000_hw *hw,
 u8 *mc_addr_list, u32 mc_addr_count);
+s32  e1000_set_default_fc_generic(struct e1000_hw *hw);


This is a redundant declaration, it's already defined in _api.h. 
Commenting this out allows the build to succeed, and if you receive this 
message it seems to be working fine. :)



hth,

Doug

--

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/

___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


Re: svn commit: r218581 - head/sys/dev/e1000

2011-02-11 Thread Bjoern A. Zeeb

On Fri, 11 Feb 2011, Doug Barton wrote:


On 02/11/2011 09:18, Jack F Vogel wrote:

Modified: head/sys/dev/e1000/e1000_mac.h
==
--- head/sys/dev/e1000/e1000_mac.h	Fri Feb 11 16:14:16 2011 
(r218580)
+++ head/sys/dev/e1000/e1000_mac.h	Fri Feb 11 17:18:42 2011 
(r218581)

@@ -70,6 +70,7 @@ s32  e1000_led_on_generic(struct e1000_h
  s32  e1000_led_off_generic(struct e1000_hw *hw);
  void e1000_update_mc_addr_list_generic(struct e1000_hw *hw,
 u8 *mc_addr_list, u32 
mc_addr_count);

+s32  e1000_set_default_fc_generic(struct e1000_hw *hw);


This is a redundant declaration, it's already defined in _api.h. Commenting 
this out allows the build to succeed, and if you receive this message it 
seems to be working fine. :)


Yeah, I put it into _api.h this morning to unbreak the build.  Jack,
you may want to revert parts of my commit and adjust to your local
trees (mine had a style bug anyway;)

That was the commit:
http://svn.freebsd.org/changeset/base/218548

/bz

--
Bjoern A. Zeeb You have to have visions!
 Stop bit received. Insert coin for new address family.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org


Re: svn commit: r218581 - head/sys/dev/e1000

2011-02-11 Thread Jack Vogel
Ya, I just saw that, I think I will Bjoern, only because its gonna be a
problem the next time
I check in shared code, I don't really even own the stuff, when my internal
build runs it just
filters the defines in the stuff according to my needs, but doesn't directly
change anything.

I was gonna send email around midnight last night and say I saw the
breakage, but I couldn't
fix it til this morning, you had good intentions anyway :)

Jack


On Fri, Feb 11, 2011 at 10:42 AM, Bjoern A. Zeeb b...@freebsd.org wrote:

 On Fri, 11 Feb 2011, Doug Barton wrote:

  On 02/11/2011 09:18, Jack F Vogel wrote:

 Modified: head/sys/dev/e1000/e1000_mac.h

 ==
 --- head/sys/dev/e1000/e1000_mac.h  Fri Feb 11 16:14:16 2011
 (r218580)
 +++ head/sys/dev/e1000/e1000_mac.h  Fri Feb 11 17:18:42 2011
 (r218581)
 @@ -70,6 +70,7 @@ s32  e1000_led_on_generic(struct e1000_h
  s32  e1000_led_off_generic(struct e1000_hw *hw);
  void e1000_update_mc_addr_list_generic(struct e1000_hw *hw,
 u8 *mc_addr_list, u32
 mc_addr_count);
 +s32  e1000_set_default_fc_generic(struct e1000_hw *hw);


 This is a redundant declaration, it's already defined in _api.h.
 Commenting this out allows the build to succeed, and if you receive this
 message it seems to be working fine. :)


 Yeah, I put it into _api.h this morning to unbreak the build.  Jack,
 you may want to revert parts of my commit and adjust to your local
 trees (mine had a style bug anyway;)

 That was the commit:
 http://svn.freebsd.org/changeset/base/218548

 /bz

 --
 Bjoern A. Zeeb You have to have visions!
 Stop bit received. Insert coin for new address family.

___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org