equal
deleted
inserted
replaced
1201 |
1201 |
1202 if (nic->flags & multicast_all) |
1202 if (nic->flags & multicast_all) |
1203 config->multicast_all = 0x1; /* 1=accept, 0=no */ |
1203 config->multicast_all = 0x1; /* 1=accept, 0=no */ |
1204 |
1204 |
1205 /* disable WoL when up */ |
1205 /* disable WoL when up */ |
1206 if (nic->ecdev || |
1206 if (nic->ecdev || |
1207 (netif_running(nic->netdev) || !(nic->flags & wol_magic))) |
1207 (netif_running(nic->netdev) || !(nic->flags & wol_magic))) |
1208 config->magic_packet_disable = 0x1; /* 1=off, 0=on */ |
1208 config->magic_packet_disable = 0x1; /* 1=off, 0=on */ |
1209 |
1209 |
1210 if (nic->mac >= mac_82558_D101_A4) { |
1210 if (nic->mac >= mac_82558_D101_A4) { |
1211 config->fc_disable = 0x1; /* 1=Tx fc off, 0=Tx fc on */ |
1211 config->fc_disable = 0x1; /* 1=Tx fc off, 0=Tx fc on */ |
3009 DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n", |
3009 DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n", |
3010 (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), |
3010 (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), |
3011 pdev->irq, netdev->dev_addr); |
3011 pdev->irq, netdev->dev_addr); |
3012 |
3012 |
3013 if (nic->ecdev) { |
3013 if (nic->ecdev) { |
3014 if (ecdev_open(nic->ecdev)) { |
3014 err = ecdev_open(nic->ecdev); |
|
3015 if (err) { |
3015 ecdev_withdraw(nic->ecdev); |
3016 ecdev_withdraw(nic->ecdev); |
3016 goto err_out_free; |
3017 goto err_out_free; |
3017 } |
3018 } |
3018 } |
3019 } |
3019 |
3020 |
3245 |
3246 |
3246 static int __init e100_init_module(void) |
3247 static int __init e100_init_module(void) |
3247 { |
3248 { |
3248 printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION |
3249 printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION |
3249 ", master " EC_MASTER_VERSION "\n"); |
3250 ", master " EC_MASTER_VERSION "\n"); |
3250 |
3251 |
3251 return pci_register_driver(&e100_driver); |
3252 return pci_register_driver(&e100_driver); |
3252 } |
3253 } |
3253 |
3254 |
3254 static void __exit e100_cleanup_module(void) |
3255 static void __exit e100_cleanup_module(void) |
3255 { |
3256 { |