diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2012-02-22 04:02:32 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-02-25 00:35:53 -0500 |
commit | 48768329efcf5e3970f54f6d15046f3e549101d8 (patch) | |
tree | 8eac2906d53dc66e1f91f18bf68163280a6b767a /drivers/net/ethernet/intel/e1000e/manage.c | |
parent | 1a46b40fbb1dfd698efbc7a9575aa64aed04d568 (diff) |
e1000e: cleanup use of check_mng_mode function pointer
Replace e1000_check_mng_mode() inline function with calls to the MAC ops
check_mng_mode function pointer.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/manage.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/manage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/manage.c b/drivers/net/ethernet/intel/e1000e/manage.c index 0d24b13ce763..473f8e711510 100644 --- a/drivers/net/ethernet/intel/e1000e/manage.c +++ b/drivers/net/ethernet/intel/e1000e/manage.c | |||
@@ -106,7 +106,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw) | |||
106 | } | 106 | } |
107 | 107 | ||
108 | /** | 108 | /** |
109 | * e1000e_check_mng_mode_generic - check management mode | 109 | * e1000e_check_mng_mode_generic - Generic check management mode |
110 | * @hw: pointer to the HW structure | 110 | * @hw: pointer to the HW structure |
111 | * | 111 | * |
112 | * Reads the firmware semaphore register and returns true (>0) if | 112 | * Reads the firmware semaphore register and returns true (>0) if |
@@ -138,7 +138,7 @@ bool e1000e_enable_tx_pkt_filtering(struct e1000_hw *hw) | |||
138 | hw->mac.tx_pkt_filtering = true; | 138 | hw->mac.tx_pkt_filtering = true; |
139 | 139 | ||
140 | /* No manageability, no filtering */ | 140 | /* No manageability, no filtering */ |
141 | if (!e1000e_check_mng_mode(hw)) { | 141 | if (!hw->mac.ops.check_mng_mode(hw)) { |
142 | hw->mac.tx_pkt_filtering = false; | 142 | hw->mac.tx_pkt_filtering = false; |
143 | return hw->mac.tx_pkt_filtering; | 143 | return hw->mac.tx_pkt_filtering; |
144 | } | 144 | } |