diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2008-08-04 18:00:27 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 01:55:26 -0400 |
commit | a6ef5e9d7dd6f3de4f88b68c390f0f0d7072944c (patch) | |
tree | 1917fe6949eda12650475cc3bc1e9134f90116f0 /drivers/net/igb/igb_main.c | |
parent | ec796b4ffc947f74e9e85198d1648e9556300c55 (diff) |
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: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-rw-r--r-- | drivers/net/igb/igb_main.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index cfed2b07f3a4..8f66e15ec8d6 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -720,28 +720,6 @@ static void igb_get_hw_control(struct igb_adapter *adapter) | |||
720 | ctrl_ext | E1000_CTRL_EXT_DRV_LOAD); | 720 | ctrl_ext | E1000_CTRL_EXT_DRV_LOAD); |
721 | } | 721 | } |
722 | 722 | ||
723 | static void igb_init_manageability(struct igb_adapter *adapter) | ||
724 | { | ||
725 | struct e1000_hw *hw = &adapter->hw; | ||
726 | |||
727 | if (adapter->en_mng_pt) { | ||
728 | u32 manc2h = rd32(E1000_MANC2H); | ||
729 | u32 manc = rd32(E1000_MANC); | ||
730 | |||
731 | /* enable receiving management packets to the host */ | ||
732 | /* this will probably generate destination unreachable messages | ||
733 | * from the host OS, but the packets will be handled on SMBUS */ | ||
734 | manc |= E1000_MANC_EN_MNG2HOST; | ||
735 | #define E1000_MNG2HOST_PORT_623 (1 << 5) | ||
736 | #define E1000_MNG2HOST_PORT_664 (1 << 6) | ||
737 | manc2h |= E1000_MNG2HOST_PORT_623; | ||
738 | manc2h |= E1000_MNG2HOST_PORT_664; | ||
739 | wr32(E1000_MANC2H, manc2h); | ||
740 | |||
741 | wr32(E1000_MANC, manc); | ||
742 | } | ||
743 | } | ||
744 | |||
745 | /** | 723 | /** |
746 | * igb_configure - configure the hardware for RX and TX | 724 | * igb_configure - configure the hardware for RX and TX |
747 | * @adapter: private board structure | 725 | * @adapter: private board structure |
@@ -755,7 +733,6 @@ static void igb_configure(struct igb_adapter *adapter) | |||
755 | igb_set_multi(netdev); | 733 | igb_set_multi(netdev); |
756 | 734 | ||
757 | igb_restore_vlan(adapter); | 735 | igb_restore_vlan(adapter); |
758 | igb_init_manageability(adapter); | ||
759 | 736 | ||
760 | igb_configure_tx(adapter); | 737 | igb_configure_tx(adapter); |
761 | igb_setup_rctl(adapter); | 738 | igb_setup_rctl(adapter); |
@@ -4524,8 +4501,6 @@ static void igb_io_resume(struct pci_dev *pdev) | |||
4524 | struct net_device *netdev = pci_get_drvdata(pdev); | 4501 | struct net_device *netdev = pci_get_drvdata(pdev); |
4525 | struct igb_adapter *adapter = netdev_priv(netdev); | 4502 | struct igb_adapter *adapter = netdev_priv(netdev); |
4526 | 4503 | ||
4527 | igb_init_manageability(adapter); | ||
4528 | |||
4529 | if (netif_running(netdev)) { | 4504 | if (netif_running(netdev)) { |
4530 | if (igb_up(adapter)) { | 4505 | if (igb_up(adapter)) { |
4531 | dev_err(&pdev->dev, "igb_up failed after reset\n"); | 4506 | dev_err(&pdev->dev, "igb_up failed after reset\n"); |