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

Commit a6ef5e9d authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Garzik
Browse files

igb: remove igb_init_managability as it is deprecated 



igb_init_managability does not actually perform any function as the two
registers it attempts to write are both read only on the host.  This patch
removes the function and all references to it from the driver.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent ec796b4f

drivers/net/igb/igb_main.c

+0 −25
Original line number Diff line number Diff line
@@ -720,28 +720,6 @@ static void igb_get_hw_control(struct igb_adapter *adapter) 
			ctrl_ext | E1000_CTRL_EXT_DRV_LOAD);

}



static void igb_init_manageability(struct igb_adapter *adapter)

{

	struct e1000_hw *hw = &adapter->hw;



	if (adapter->en_mng_pt) {

		u32 manc2h = rd32(E1000_MANC2H);

		u32 manc = rd32(E1000_MANC);



		/* enable receiving management packets to the host */

		/* this will probably generate destination unreachable messages

		 * from the host OS, but the packets will be handled on SMBUS */

		manc |= E1000_MANC_EN_MNG2HOST;

#define E1000_MNG2HOST_PORT_623 (1 << 5)

#define E1000_MNG2HOST_PORT_664 (1 << 6)

		manc2h |= E1000_MNG2HOST_PORT_623;

		manc2h |= E1000_MNG2HOST_PORT_664;

		wr32(E1000_MANC2H, manc2h);



		wr32(E1000_MANC, manc);

	}

}



/**

 * igb_configure - configure the hardware for RX and TX

 * @adapter: private board structure
@@ -755,7 +733,6 @@ static void igb_configure(struct igb_adapter *adapter) 
	igb_set_multi(netdev);



	igb_restore_vlan(adapter);

	igb_init_manageability(adapter);



	igb_configure_tx(adapter);

	igb_setup_rctl(adapter);
@@ -4524,8 +4501,6 @@ static void igb_io_resume(struct pci_dev *pdev) 
	struct net_device *netdev = pci_get_drvdata(pdev);

	struct igb_adapter *adapter = netdev_priv(netdev);



	igb_init_manageability(adapter);



	if (netif_running(netdev)) {

		if (igb_up(adapter)) {

			dev_err(&pdev->dev, "igb_up failed after reset\n");