equal
deleted
inserted
replaced
1202 |
1202 |
1203 if (nic->flags & multicast_all) |
1203 if (nic->flags & multicast_all) |
1204 config->multicast_all = 0x1; /* 1=accept, 0=no */ |
1204 config->multicast_all = 0x1; /* 1=accept, 0=no */ |
1205 |
1205 |
1206 /* disable WoL when up */ |
1206 /* disable WoL when up */ |
1207 if (nic->ecdev || |
1207 if (nic->ecdev || |
1208 (netif_running(nic->netdev) || !(nic->flags & wol_magic))) |
1208 (netif_running(nic->netdev) || !(nic->flags & wol_magic))) |
1209 config->magic_packet_disable = 0x1; /* 1=off, 0=on */ |
1209 config->magic_packet_disable = 0x1; /* 1=off, 0=on */ |
1210 |
1210 |
1211 if (nic->mac >= mac_82558_D101_A4) { |
1211 if (nic->mac >= mac_82558_D101_A4) { |
1212 config->fc_disable = 0x1; /* 1=Tx fc off, 0=Tx fc on */ |
1212 config->fc_disable = 0x1; /* 1=Tx fc off, 0=Tx fc on */ |
3035 "addr 0x%llx, irq %d, MAC addr %pM\n", |
3035 "addr 0x%llx, irq %d, MAC addr %pM\n", |
3036 (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), |
3036 (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), |
3037 pdev->irq, netdev->dev_addr); |
3037 pdev->irq, netdev->dev_addr); |
3038 |
3038 |
3039 if (nic->ecdev) { |
3039 if (nic->ecdev) { |
3040 if (ecdev_open(nic->ecdev)) { |
3040 err = ecdev_open(nic->ecdev); |
|
3041 if (err) { |
3041 ecdev_withdraw(nic->ecdev); |
3042 ecdev_withdraw(nic->ecdev); |
3042 goto err_out_free; |
3043 goto err_out_free; |
3043 } |
3044 } |
3044 } |
3045 } |
3045 |
3046 |