devices/e100-2.6.32-ethercat.c
branchstable-1.5
changeset 2421 bc2d4bf9cbe5
parent 2419 fdb85a806585
child 2582 87e502828b3f
equal deleted inserted replaced
2420:69056c46aa4d 2421:bc2d4bf9cbe5
  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 */
  3237 
  3237 
  3238 static int __init e100_init_module(void)
  3238 static int __init e100_init_module(void)
  3239 {
  3239 {
  3240 	printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
  3240 	printk(KERN_INFO DRV_NAME " " DRV_DESCRIPTION " " DRV_VERSION
  3241 			", master " EC_MASTER_VERSION "\n");
  3241 			", master " EC_MASTER_VERSION "\n");
  3242  
  3242 
  3243  	return pci_register_driver(&e100_driver);
  3243  	return pci_register_driver(&e100_driver);
  3244 }
  3244 }
  3245 
  3245 
  3246 static void __exit e100_cleanup_module(void)
  3246 static void __exit e100_cleanup_module(void)
  3247 {
  3247 {