aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e100.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 763810c7f33a..74ea6373c7cd 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -159,7 +159,7 @@
159 159
160#define DRV_NAME "e100" 160#define DRV_NAME "e100"
161#define DRV_EXT "-NAPI" 161#define DRV_EXT "-NAPI"
162#define DRV_VERSION "3.5.17-k4"DRV_EXT 162#define DRV_VERSION "3.5.23-k4"DRV_EXT
163#define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver" 163#define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver"
164#define DRV_COPYRIGHT "Copyright(c) 1999-2006 Intel Corporation" 164#define DRV_COPYRIGHT "Copyright(c) 1999-2006 Intel Corporation"
165#define PFX DRV_NAME ": " 165#define PFX DRV_NAME ": "
@@ -1024,10 +1024,16 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
1024 config->mwi_enable = 0x1; /* 1=enable, 0=disable */ 1024 config->mwi_enable = 0x1; /* 1=enable, 0=disable */
1025 config->standard_tcb = 0x0; /* 1=standard, 0=extended */ 1025 config->standard_tcb = 0x0; /* 1=standard, 0=extended */
1026 config->rx_long_ok = 0x1; /* 1=VLANs ok, 0=standard */ 1026 config->rx_long_ok = 0x1; /* 1=VLANs ok, 0=standard */
1027 if(nic->mac >= mac_82559_D101M) 1027 if (nic->mac >= mac_82559_D101M) {
1028 config->tno_intr = 0x1; /* TCO stats enable */ 1028 config->tno_intr = 0x1; /* TCO stats enable */
1029 else 1029 /* Enable TCO in extended config */
1030 if (nic->mac >= mac_82551_10) {
1031 config->byte_count = 0x20; /* extended bytes */
1032 config->rx_d102_mode = 0x1; /* GMRC for TCO */
1033 }
1034 } else {
1030 config->standard_stat_counter = 0x0; 1035 config->standard_stat_counter = 0x0;
1036 }
1031 } 1037 }
1032 1038
1033 DPRINTK(HW, DEBUG, "[00-07]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n", 1039 DPRINTK(HW, DEBUG, "[00-07]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",