Deleted Added
full compact
if_em.c (141298) if_em.c (143161)
1/**************************************************************************
2
3Copyright (c) 2001-2003, Intel Corporation
4All rights reserved.
5
6Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met:
8

--- 17 unchanged lines hidden (view full) ---

26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30POSSIBILITY OF SUCH DAMAGE.
31
32***************************************************************************/
33
1/**************************************************************************
2
3Copyright (c) 2001-2003, Intel Corporation
4All rights reserved.
5
6Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met:
8

--- 17 unchanged lines hidden (view full) ---

26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30POSSIBILITY OF SUCH DAMAGE.
31
32***************************************************************************/
33
34/*$FreeBSD: head/sys/dev/em/if_em.c 141298 2005-02-04 18:36:04Z glebius $*/
34/*$FreeBSD: head/sys/dev/em/if_em.c 143161 2005-03-05 18:30:12Z imp $*/
35
36#include <dev/em/if_em.h>
37
38/*********************************************************************
39 * Set this to one to display debug statistics
40 *********************************************************************/
41int em_display_debug_stats = 0;
42

--- 183 unchanged lines hidden (view full) ---

226TUNABLE_INT("hw.em.rx_abs_int_delay", &em_rx_abs_int_delay_dflt);
227
228/*********************************************************************
229 * Device identification routine
230 *
231 * em_probe determines if the driver should be loaded on
232 * adapter based on PCI vendor/device id of the adapter.
233 *
35
36#include <dev/em/if_em.h>
37
38/*********************************************************************
39 * Set this to one to display debug statistics
40 *********************************************************************/
41int em_display_debug_stats = 0;
42

--- 183 unchanged lines hidden (view full) ---

226TUNABLE_INT("hw.em.rx_abs_int_delay", &em_rx_abs_int_delay_dflt);
227
228/*********************************************************************
229 * Device identification routine
230 *
231 * em_probe determines if the driver should be loaded on
232 * adapter based on PCI vendor/device id of the adapter.
233 *
234 * return 0 on success, positive on failure
234 * return BUS_PROBE_DEFAULT on success, positive on failure
235 *********************************************************************/
236
237static int
238em_probe(device_t dev)
239{
240 em_vendor_info_t *ent;
241
242 u_int16_t pci_vendor_id = 0;

--- 21 unchanged lines hidden (view full) ---

264 (ent->subvendor_id == PCI_ANY_ID)) &&
265
266 ((pci_subdevice_id == ent->subdevice_id) ||
267 (ent->subdevice_id == PCI_ANY_ID))) {
268 sprintf(adapter_name, "%s, Version - %s",
269 em_strings[ent->index],
270 em_driver_version);
271 device_set_desc_copy(dev, adapter_name);
235 *********************************************************************/
236
237static int
238em_probe(device_t dev)
239{
240 em_vendor_info_t *ent;
241
242 u_int16_t pci_vendor_id = 0;

--- 21 unchanged lines hidden (view full) ---

264 (ent->subvendor_id == PCI_ANY_ID)) &&
265
266 ((pci_subdevice_id == ent->subdevice_id) ||
267 (ent->subdevice_id == PCI_ANY_ID))) {
268 sprintf(adapter_name, "%s, Version - %s",
269 em_strings[ent->index],
270 em_driver_version);
271 device_set_desc_copy(dev, adapter_name);
272 return(0);
272 return(BUS_PROBE_DEFAULT);
273 }
274 ent++;
275 }
276
277 return(ENXIO);
278}
279
280/*********************************************************************

--- 3173 unchanged lines hidden ---
273 }
274 ent++;
275 }
276
277 return(ENXIO);
278}
279
280/*********************************************************************

--- 3173 unchanged lines hidden ---