|
@@ -295,7 +295,9 @@ static int intel_reset ( struct intel_nic *intel ) {
|
295
|
295
|
mdelay ( INTEL_RESET_DELAY_MS );
|
296
|
296
|
|
297
|
297
|
/* Set a sensible default configuration */
|
298
|
|
- ctrl |= ( INTEL_CTRL_SLU | INTEL_CTRL_ASDE );
|
|
298
|
+ if ( ! ( intel->flags & INTEL_NO_ASDE ) )
|
|
299
|
+ ctrl |= INTEL_CTRL_ASDE;
|
|
300
|
+ ctrl |= INTEL_CTRL_SLU;
|
299
|
301
|
ctrl &= ~( INTEL_CTRL_LRST | INTEL_CTRL_FRCSPD | INTEL_CTRL_FRCDPLX );
|
300
|
302
|
writel ( ctrl, intel->regs + INTEL_CTRL );
|
301
|
303
|
mdelay ( INTEL_RESET_DELAY_MS );
|
|
@@ -1110,7 +1112,7 @@ static struct pci_device_id intel_nics[] = {
|
1110
|
1112
|
PCI_ROM ( 0x8086, 0x1518, "82576ns", "82576NS SerDes", 0 ),
|
1111
|
1113
|
PCI_ROM ( 0x8086, 0x1521, "i350", "I350", 0 ),
|
1112
|
1114
|
PCI_ROM ( 0x8086, 0x1522, "i350-f", "I350 Fiber", 0 ),
|
1113
|
|
- PCI_ROM ( 0x8086, 0x1523, "i350-b", "I350 Backplane", 0 ),
|
|
1115
|
+ PCI_ROM ( 0x8086, 0x1523, "i350-b", "I350 Backplane", INTEL_NO_ASDE ),
|
1114
|
1116
|
PCI_ROM ( 0x8086, 0x1524, "i350-2", "I350", 0 ),
|
1115
|
1117
|
PCI_ROM ( 0x8086, 0x1525, "82567v-4", "82567V-4", 0 ),
|
1116
|
1118
|
PCI_ROM ( 0x8086, 0x1526, "82576-5", "82576", 0 ),
|