Re: svn commit: r235527 - stable/9/sys/dev/e1000
On 2012-05-17 00:22, Jack F Vogel wrote: Author: jfv Date: Wed May 16 22:22:52 2012 New Revision: 235527 URL: http://svn.freebsd.org/changeset/base/235527 Log: MFC of the e1000 drivers: revisions include 227309,228281,228386,228387,228393,228405, 228415,228788,228803,229606,229767,229939, 230023,230024,230742,231796,232238,233708, 234154,234665,235256 ... Hi Jack, Some of the netmap-related changes in this merge don't work, at least not for the LINT kernels: TB --- 2012-05-17 07:31:43 - /usr/bin/make -B buildkernel KERNCONF=LINT ... cc1: warnings being treated as errors /src/sys/dev/e1000/if_em.c: In function 'em_setup_transmit_ring': /src/sys/dev/e1000/if_em.c:3332: warning: implicit declaration of function 'netmap_idx_n2k' /src/sys/dev/e1000/if_em.c:3332: warning: nested extern declaration of 'netmap_idx_n2k' [-Wnested-externs] /src/sys/dev/e1000/if_em.c: In function 'em_txeof': /src/sys/dev/e1000/if_em.c:3795: error: 'struct netmap_adapter' has no member named 'tx_si' /src/sys/dev/e1000/if_em.c: In function 'em_rxeof': /src/sys/dev/e1000/if_em.c:4407: error: 'struct netmap_adapter' has no member named 'rx_si' *** Error code 1 Can you please have a look at it? ___ 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: r235527 - stable/9/sys/dev/e1000
On Thu, May 17, 2012 at 02:59:37PM +0200, Dimitry Andric wrote: On 2012-05-17 00:22, Jack F Vogel wrote: Author: jfv Date: Wed May 16 22:22:52 2012 New Revision: 235527 URL: http://svn.freebsd.org/changeset/base/235527 Log: MFC of the e1000 drivers: revisions include 227309,228281,228386,228387,228393,228405, 228415,228788,228803,229606,229767,229939, 230023,230024,230742,231796,232238,233708, 234154,234665,235256 ... Hi Jack, Some of the netmap-related changes in this merge don't work, at least not for the LINT kernels: TB --- 2012-05-17 07:31:43 - /usr/bin/make -B buildkernel KERNCONF=LINT ... cc1: warnings being treated as errors /src/sys/dev/e1000/if_em.c: In function 'em_setup_transmit_ring': /src/sys/dev/e1000/if_em.c:3332: warning: implicit declaration of function 'netmap_idx_n2k' /src/sys/dev/e1000/if_em.c:3332: warning: nested extern declaration of 'netmap_idx_n2k' [-Wnested-externs] /src/sys/dev/e1000/if_em.c: In function 'em_txeof': /src/sys/dev/e1000/if_em.c:3795: error: 'struct netmap_adapter' has no member named 'tx_si' /src/sys/dev/e1000/if_em.c: In function 'em_rxeof': /src/sys/dev/e1000/if_em.c:4407: error: 'struct netmap_adapter' has no member named 'rx_si' *** Error code 1 i will take care of this later today. it is probably due to the dev/netmap/* code not in sync with the one in HEAD (i thought i had MFC'ed it but maybe i forgot) cheers luigi Can you please have a look at it? ___ 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: r235527 - stable/9/sys/dev/e1000
On Thu, May 17, 2012 at 03:51:14PM +0200, Luigi Rizzo wrote: ... Hi Jack, Some of the netmap-related changes in this merge don't work, at least not for the LINT kernels: should be fixed now - i have merged the netmap code from HEAD which was the cause of the LINT failure cheers luigi ___ 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: r235527 - stable/9/sys/dev/e1000
Cool, thanks Luigi! Jack On Thu, May 17, 2012 at 8:24 AM, Luigi Rizzo ri...@iet.unipi.it wrote: On Thu, May 17, 2012 at 03:51:14PM +0200, Luigi Rizzo wrote: ... Hi Jack, Some of the netmap-related changes in this merge don't work, at least not for the LINT kernels: should be fixed now - i have merged the netmap code from HEAD which was the cause of the LINT failure cheers luigi ___ 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
svn commit: r235527 - stable/9/sys/dev/e1000
Author: jfv Date: Wed May 16 22:22:52 2012 New Revision: 235527 URL: http://svn.freebsd.org/changeset/base/235527 Log: MFC of the e1000 drivers: revisions include 227309,228281,228386,228387,228393,228405, 228415,228788,228803,229606,229767,229939, 230023,230024,230742,231796,232238,233708, 234154,234665,235256 Modified: stable/9/sys/dev/e1000/README stable/9/sys/dev/e1000/e1000_80003es2lan.c stable/9/sys/dev/e1000/e1000_80003es2lan.h stable/9/sys/dev/e1000/e1000_82540.c stable/9/sys/dev/e1000/e1000_82541.c stable/9/sys/dev/e1000/e1000_82543.c stable/9/sys/dev/e1000/e1000_82571.c stable/9/sys/dev/e1000/e1000_82575.c stable/9/sys/dev/e1000/e1000_82575.h stable/9/sys/dev/e1000/e1000_api.c stable/9/sys/dev/e1000/e1000_api.h stable/9/sys/dev/e1000/e1000_defines.h stable/9/sys/dev/e1000/e1000_hw.h stable/9/sys/dev/e1000/e1000_ich8lan.c stable/9/sys/dev/e1000/e1000_ich8lan.h stable/9/sys/dev/e1000/e1000_mac.c stable/9/sys/dev/e1000/e1000_nvm.c stable/9/sys/dev/e1000/e1000_nvm.h stable/9/sys/dev/e1000/e1000_phy.c stable/9/sys/dev/e1000/e1000_phy.h stable/9/sys/dev/e1000/e1000_regs.h stable/9/sys/dev/e1000/e1000_vf.c stable/9/sys/dev/e1000/if_em.c stable/9/sys/dev/e1000/if_em.h stable/9/sys/dev/e1000/if_igb.c stable/9/sys/dev/e1000/if_igb.h stable/9/sys/dev/e1000/if_lem.c stable/9/sys/dev/e1000/if_lem.h Directory Properties: stable/9/sys/dev/e1000/ (props changed) Modified: stable/9/sys/dev/e1000/README == --- stable/9/sys/dev/e1000/README Wed May 16 22:21:57 2012 (r235526) +++ stable/9/sys/dev/e1000/README Wed May 16 22:22:52 2012 (r235527) @@ -354,6 +354,7 @@ Known Limitations include: Planex FXG-08TE I-O Data ETG-SH8 +Netgear GS105v3 The driver can be compiled with the following changes: Modified: stable/9/sys/dev/e1000/e1000_80003es2lan.c == --- stable/9/sys/dev/e1000/e1000_80003es2lan.c Wed May 16 22:21:57 2012 (r235526) +++ stable/9/sys/dev/e1000/e1000_80003es2lan.c Wed May 16 22:22:52 2012 (r235527) @@ -1,6 +1,6 @@ /** - Copyright (c) 2001-2010, Intel Corporation + Copyright (c) 2001-2011, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,18 +47,18 @@ static void e1000_release_phy_80003es2la static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw); static void e1000_release_nvm_80003es2lan(struct e1000_hw *hw); static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, - u32 offset, - u16 *data); + u32 offset, + u16 *data); static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, -u32 offset, -u16 data); + u32 offset, + u16 data); static s32 e1000_write_nvm_80003es2lan(struct e1000_hw *hw, u16 offset, -u16 words, u16 *data); + u16 words, u16 *data); static s32 e1000_get_cfg_done_80003es2lan(struct e1000_hw *hw); static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw); static s32 e1000_get_cable_length_80003es2lan(struct e1000_hw *hw); static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed, - u16 *duplex); + u16 *duplex); static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw); static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw); static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw); @@ -68,9 +68,9 @@ static s32 e1000_cfg_kmrn_10_100_80003e static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw); static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw); static s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, -u16 *data); + u16 *data); static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, - u16 data); +u16 data); static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw); static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw); static void e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16
