devices/e100-2.6.33-ethercat.c
branchstable-1.5
changeset 2421 bc2d4bf9cbe5
parent 2222 28e99697f6e6
child 2582 87e502828b3f
equal deleted inserted replaced
2420:69056c46aa4d 2421:bc2d4bf9cbe5
  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 */
  3245 
  3245 
  3246 static int __init e100_init_module(void)
  3246 static int __init e100_init_module(void)
  3247 {
  3247 {
  3248 	printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
  3248 	printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
  3249 			", master " EC_MASTER_VERSION "\n");
  3249 			", master " EC_MASTER_VERSION "\n");
  3250  
  3250 
  3251  	return pci_register_driver(&e100_driver);
  3251  	return pci_register_driver(&e100_driver);
  3252 }
  3252 }
  3253 
  3253 
  3254 static void __exit e100_cleanup_module(void)
  3254 static void __exit e100_cleanup_module(void)
  3255 {
  3255 {