Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2eba932 authored by Malli Chilakala's avatar Malli Chilakala Committed by Jeff Garzik
Browse files

[PATCH] ixgb: Remove hook for suspend, no power management 



Remove hook for suspend. No power management in 10GbE Controllers

Signed-off-by: default avatarMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: default avatarGanesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: default avatarJohn Ronciak <john.ronciak@intel.com>

diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c
parent 5e3c30de

drivers/net/ixgb/ixgb_main.c

+4 −71
Original line number Original line Diff line number Diff line
@@ -120,21 +120,11 @@ static void ixgb_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid); 
static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);

static void ixgb_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);

static void ixgb_restore_vlan(struct ixgb_adapter *adapter);

static void ixgb_restore_vlan(struct ixgb_adapter *adapter);





static int ixgb_notify_reboot(struct notifier_block *, unsigned long event,

			      void *ptr);

static int ixgb_suspend(struct pci_dev *pdev, uint32_t state);



#ifdef CONFIG_NET_POLL_CONTROLLER

#ifdef CONFIG_NET_POLL_CONTROLLER

/* for netdump / net console */

/* for netdump / net console */

static void ixgb_netpoll(struct net_device *dev);

static void ixgb_netpoll(struct net_device *dev);

#endif

#endif





struct notifier_block ixgb_notifier_reboot = {

	.notifier_call = ixgb_notify_reboot,

	.next = NULL,

	.priority = 0

};



/* Exported from other modules */

/* Exported from other modules */





extern void ixgb_check_options(struct ixgb_adapter *adapter);

extern void ixgb_check_options(struct ixgb_adapter *adapter);
@@ -144,9 +134,6 @@ static struct pci_driver ixgb_driver = { 
	.id_table = ixgb_pci_tbl,

	.id_table = ixgb_pci_tbl,

	.probe    = ixgb_probe,

	.probe    = ixgb_probe,

	.remove   = __devexit_p(ixgb_remove),

	.remove   = __devexit_p(ixgb_remove),

	/* Power Managment Hooks */

	.suspend = NULL,

	.resume = NULL

};

};





MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");

MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
@@ -169,17 +156,12 @@ MODULE_LICENSE("GPL"); 
static int __init

static int __init

ixgb_init_module(void)

ixgb_init_module(void)

{

{

	int ret;

	printk(KERN_INFO "%s - version %s\n",

	printk(KERN_INFO "%s - version %s\n",

	       ixgb_driver_string, ixgb_driver_version);

	       ixgb_driver_string, ixgb_driver_version);





	printk(KERN_INFO "%s\n", ixgb_copyright);

	printk(KERN_INFO "%s\n", ixgb_copyright);





	ret = pci_module_init(&ixgb_driver);

	return pci_module_init(&ixgb_driver);

	if(ret >= 0) {

		register_reboot_notifier(&ixgb_notifier_reboot);

	}

	return ret;

}

}





module_init(ixgb_init_module);

module_init(ixgb_init_module);
@@ -194,7 +176,6 @@ module_init(ixgb_init_module); 
static void __exit

static void __exit

ixgb_exit_module(void)

ixgb_exit_module(void)

{

{

	unregister_reboot_notifier(&ixgb_notifier_reboot);

	pci_unregister_driver(&ixgb_driver);

	pci_unregister_driver(&ixgb_driver);

}

}
@@ -2121,54 +2102,6 @@ ixgb_restore_vlan(struct ixgb_adapter *adapter) 
	}

	}

}

}





/**

 * ixgb_notify_reboot - handles OS notification of reboot event.

 * @param nb notifier block, unused

 * @param event Event being passed to driver to act upon

 * @param p A pointer to our net device

 **/

static int

ixgb_notify_reboot(struct notifier_block *nb, unsigned long event, void *p)

{

	struct pci_dev *pdev = NULL;



	switch(event) {

	case SYS_DOWN:

	case SYS_HALT:

	case SYS_POWER_OFF:

		while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev))) {

			if (pci_dev_driver(pdev) == &ixgb_driver)

				ixgb_suspend(pdev, 3);

		}

	}

	return NOTIFY_DONE;

}



/**

 * ixgb_suspend - driver suspend function called from notify.

 * @param pdev pci driver structure used for passing to

 * @param state power state to enter 

 **/

static int

ixgb_suspend(struct pci_dev *pdev, uint32_t state)

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct ixgb_adapter *adapter = netdev->priv;



	netif_device_detach(netdev);



	if(netif_running(netdev))

		ixgb_down(adapter, TRUE);



	pci_save_state(pdev);



	state = (state > 0) ? 3 : 0;

	pci_set_power_state(pdev, state);

	msec_delay(200);



	return 0;

}



#ifdef CONFIG_NET_POLL_CONTROLLER

#ifdef CONFIG_NET_POLL_CONTROLLER

/*

/*

 * Polling 'interrupt' - used by things like netconsole to send skbs

 * Polling 'interrupt' - used by things like netconsole to send skbs