diff options
author | Akeem G Abodunrin <akeem.g.abodunrin@intel.com> | 2014-05-10 00:49:03 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-06-08 05:01:26 -0400 |
commit | a5282f447d5e50cf285770226156a566e73687c2 (patch) | |
tree | 1ffa0a2226a716288d6826f424ab3e76eb94f8a8 | |
parent | 467d729abb72d7c497be6fc2692f679f62922813 (diff) |
i40e/i40evf: Clean up a few things
1. There is no ixgbe_watchdog_task function in the driver, so change
the comment to the correct function name, i40e_watchdog_subtask.
2. Remove num_msix_entries from interrupt set_up routine
because it is never used.
3. Remove some TBD comments that are not needed.
Change-ID: I37697a04007074b797f85fd83d626672e4df1ad1
Signed-off-by: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 4 |
4 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index 9c27d8b657b2..dc6d7c6fb060 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h | |||
@@ -201,7 +201,6 @@ struct i40e_pf { | |||
201 | unsigned long state; | 201 | unsigned long state; |
202 | unsigned long link_check_timeout; | 202 | unsigned long link_check_timeout; |
203 | struct msix_entry *msix_entries; | 203 | struct msix_entry *msix_entries; |
204 | u16 num_msix_entries; | ||
205 | bool fc_autoneg_status; | 204 | bool fc_autoneg_status; |
206 | 205 | ||
207 | u16 eeprom_version; | 206 | u16 eeprom_version; |
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 63147a61677b..00fdc3035951 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
@@ -397,7 +397,7 @@ static struct rtnl_link_stats64 *i40e_get_netdev_stats_struct( | |||
397 | } | 397 | } |
398 | rcu_read_unlock(); | 398 | rcu_read_unlock(); |
399 | 399 | ||
400 | /* following stats updated by ixgbe_watchdog_task() */ | 400 | /* following stats updated by i40e_watchdog_subtask() */ |
401 | stats->multicast = vsi_stats->multicast; | 401 | stats->multicast = vsi_stats->multicast; |
402 | stats->tx_errors = vsi_stats->tx_errors; | 402 | stats->tx_errors = vsi_stats->tx_errors; |
403 | stats->tx_dropped = vsi_stats->tx_dropped; | 403 | stats->tx_dropped = vsi_stats->tx_dropped; |
@@ -6139,8 +6139,6 @@ static int i40e_reserve_msix_vectors(struct i40e_pf *pf, int vectors) | |||
6139 | vectors = 0; | 6139 | vectors = 0; |
6140 | } | 6140 | } |
6141 | 6141 | ||
6142 | pf->num_msix_entries = vectors; | ||
6143 | |||
6144 | return vectors; | 6142 | return vectors; |
6145 | } | 6143 | } |
6146 | 6144 | ||
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h index 22a1b69cd646..70951d2edcad 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | |||
@@ -341,10 +341,6 @@ struct i40e_virtchnl_pf_event { | |||
341 | int severity; | 341 | int severity; |
342 | }; | 342 | }; |
343 | 343 | ||
344 | /* The following are TBD, not necessary for LAN functionality. | ||
345 | * I40E_VIRTCHNL_OP_FCOE | ||
346 | */ | ||
347 | |||
348 | /* VF reset states - these are written into the RSTAT register: | 344 | /* VF reset states - these are written into the RSTAT register: |
349 | * I40E_VFGEN_RSTAT1 on the PF | 345 | * I40E_VFGEN_RSTAT1 on the PF |
350 | * I40E_VFGEN_RSTAT on the VF | 346 | * I40E_VFGEN_RSTAT on the VF |
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h b/drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h index 1ef5b31ece90..cd18d5689006 100644 --- a/drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h +++ b/drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | |||
@@ -341,10 +341,6 @@ struct i40e_virtchnl_pf_event { | |||
341 | int severity; | 341 | int severity; |
342 | }; | 342 | }; |
343 | 343 | ||
344 | /* The following are TBD, not necessary for LAN functionality. | ||
345 | * I40E_VIRTCHNL_OP_FCOE | ||
346 | */ | ||
347 | |||
348 | /* VF reset states - these are written into the RSTAT register: | 344 | /* VF reset states - these are written into the RSTAT register: |
349 | * I40E_VFGEN_RSTAT1 on the PF | 345 | * I40E_VFGEN_RSTAT1 on the PF |
350 | * I40E_VFGEN_RSTAT on the VF | 346 | * I40E_VFGEN_RSTAT on the VF |