diff options
| author | chenlu chen - Sun Microsystems - Beijing China <Chenlu.Chen@Sun.COM> | 2010-05-11 07:02:24 +0800 |
|---|---|---|
| committer | chenlu chen - Sun Microsystems - Beijing China <Chenlu.Chen@Sun.COM> | 2010-05-11 07:02:24 +0800 |
| commit | 08a0f9b044f01fb540a861b94b63d77dd3d576ee (patch) | |
| tree | 6147147e43d5ac499a3b9cfdb5cae4eac49dbcde | |
| parent | c168ccb765b0a617be17ad2b42fb3a85266fbea4 (diff) | |
| download | illumos-joyent-08a0f9b044f01fb540a861b94b63d77dd3d576ee.tar.gz | |
6882613 igb panic on serpa systems
| -rw-r--r-- | usr/src/uts/common/io/igb/igb_main.c | 13 | ||||
| -rw-r--r-- | usr/src/uts/common/io/igb/igb_sw.h | 10 |
2 files changed, 6 insertions, 17 deletions
diff --git a/usr/src/uts/common/io/igb/igb_main.c b/usr/src/uts/common/io/igb/igb_main.c index 9aa673c48e..7170adc65b 100644 --- a/usr/src/uts/common/io/igb/igb_main.c +++ b/usr/src/uts/common/io/igb/igb_main.c @@ -30,7 +30,7 @@ #include "igb_sw.h" static char ident[] = "Intel 1Gb Ethernet"; -static char igb_version[] = "igb 1.1.14"; +static char igb_version[] = "igb 1.1.15"; /* * Local function protoypes @@ -3013,7 +3013,6 @@ igb_link_check(igb_t *igb) igb->link_speed = speed; igb->link_duplex = duplex; igb->link_state = LINK_STATE_UP; - igb->link_down_timeout = 0; link_changed = B_TRUE; if (!igb->link_complete) igb_stop_link_timer(igb); @@ -3025,16 +3024,6 @@ igb_link_check(igb_t *igb) igb->link_state = LINK_STATE_DOWN; link_changed = B_TRUE; } - - if (igb->igb_state & IGB_STARTED) { - if (igb->link_down_timeout < MAX_LINK_DOWN_TIMEOUT) { - igb->link_down_timeout++; - } else if (igb->link_down_timeout == - MAX_LINK_DOWN_TIMEOUT) { - igb_tx_clean(igb); - igb->link_down_timeout++; - } - } } if (igb_check_acc_handle(igb->osdep.reg_handle) != DDI_FM_OK) { diff --git a/usr/src/uts/common/io/igb/igb_sw.h b/usr/src/uts/common/io/igb/igb_sw.h index 080cd1bed6..90ecc1fb5a 100644 --- a/usr/src/uts/common/io/igb/igb_sw.h +++ b/usr/src/uts/common/io/igb/igb_sw.h @@ -1,7 +1,6 @@ /* * CDDL HEADER START * - * Copyright(c) 2007-2009 Intel Corporation. All rights reserved. * The contents of this file are subject to the terms of the * Common Development and Distribution License (the "License"). * You may not use this file except in compliance with the License. @@ -21,8 +20,11 @@ */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright(c) 2007-2010 Intel Corporation. All rights reserved. + */ + +/* + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. */ #ifndef _IGB_SW_H @@ -165,7 +167,6 @@ extern "C" { #define RX_DRAIN_TIME 200 #define STALL_WATCHDOG_TIMEOUT 8 /* 8 seconds */ -#define MAX_LINK_DOWN_TIMEOUT 8 /* 8 seconds */ /* * Defined for IP header alignment. @@ -565,7 +566,6 @@ typedef struct igb { link_state_t link_state; uint32_t link_speed; uint32_t link_duplex; - uint32_t link_down_timeout; boolean_t link_complete; timeout_id_t link_tid; |