equal
deleted
inserted
replaced
1203 |
1203 |
1204 if (nic->flags & multicast_all) |
1204 if (nic->flags & multicast_all) |
1205 config->multicast_all = 0x1; /* 1=accept, 0=no */ |
1205 config->multicast_all = 0x1; /* 1=accept, 0=no */ |
1206 |
1206 |
1207 /* disable WoL when up */ |
1207 /* disable WoL when up */ |
1208 if (nic->ecdev || |
1208 if (nic->ecdev || |
1209 (netif_running(nic->netdev) || !(nic->flags & wol_magic))) |
1209 (netif_running(nic->netdev) || !(nic->flags & wol_magic))) |
1210 config->magic_packet_disable = 0x1; /* 1=off, 0=on */ |
1210 config->magic_packet_disable = 0x1; /* 1=off, 0=on */ |
1211 |
1211 |
1212 if (nic->mac >= mac_82558_D101_A4) { |
1212 if (nic->mac >= mac_82558_D101_A4) { |
1213 config->fc_disable = 0x1; /* 1=Tx fc off, 0=Tx fc on */ |
1213 config->fc_disable = 0x1; /* 1=Tx fc off, 0=Tx fc on */ |
3001 DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n", |
3001 DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n", |
3002 (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), |
3002 (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), |
3003 pdev->irq, netdev->dev_addr); |
3003 pdev->irq, netdev->dev_addr); |
3004 |
3004 |
3005 if (nic->ecdev) { |
3005 if (nic->ecdev) { |
3006 if (ecdev_open(nic->ecdev)) { |
3006 err = ecdev_open(nic->ecdev); |
|
3007 if (err) { |
3007 ecdev_withdraw(nic->ecdev); |
3008 ecdev_withdraw(nic->ecdev); |
3008 goto err_out_free; |
3009 goto err_out_free; |
3009 } |
3010 } |
3010 } |
3011 } |
3011 |
3012 |
3237 |
3238 |
3238 static int __init e100_init_module(void) |
3239 static int __init e100_init_module(void) |
3239 { |
3240 { |
3240 printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION |
3241 printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION |
3241 ", master " EC_MASTER_VERSION "\n"); |
3242 ", master " EC_MASTER_VERSION "\n"); |
3242 |
3243 |
3243 return pci_register_driver(&e100_driver); |
3244 return pci_register_driver(&e100_driver); |
3244 } |
3245 } |
3245 |
3246 |
3246 static void __exit e100_cleanup_module(void) |
3247 static void __exit e100_cleanup_module(void) |
3247 { |
3248 { |