| Message ID | 1406533278-27979-1-git-send-email-ethan.zhao@oracle.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
> From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel- > owner@vger.kernel.org] On Behalf Of Ethan Zhao > Sent: Monday, July 28, 2014 12:41 AM > To: Kirsher, Jeffrey T; Brandeburg, Jesse; Allan, Bruce W; Wyborny, > Carolyn; Skidmore, Donald C; Rose, Gregory V; Duyck, Alexander H; Ronciak, > John; Williams, Mitch A > Cc: Linux NICS; e1000-devel@lists.sourceforge.net; netdev@vger.kernel.org; > linux-kernel@vger.kernel.org; ethan.kernel@gmail.com; Ethan Zhao > Subject: [PATCH] ixgbe: remove useless bd_number from adapter struct > > Because bd_number is not useful anymore, so remove it from adapter struct, > or > if keep it, we have to fix the boards driven counter bug in ixgbe_remove() > and > ixgbe_probe() only for trival debug purpose -- other output is enough. Thanks Ethan, I (briefly covering for Jeff Kirsher) have added this patch and your other one ofr ixgbevf to Jeff's internal tree. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks Brown, Aaron F On Tue, Jul 29, 2014 at 10:51 AM, Brown, Aaron F <aaron.f.brown@intel.com> wrote: >> From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel- >> owner@vger.kernel.org] On Behalf Of Ethan Zhao >> Sent: Monday, July 28, 2014 12:41 AM >> To: Kirsher, Jeffrey T; Brandeburg, Jesse; Allan, Bruce W; Wyborny, >> Carolyn; Skidmore, Donald C; Rose, Gregory V; Duyck, Alexander H; Ronciak, >> John; Williams, Mitch A >> Cc: Linux NICS; e1000-devel@lists.sourceforge.net; netdev@vger.kernel.org; >> linux-kernel@vger.kernel.org; ethan.kernel@gmail.com; Ethan Zhao >> Subject: [PATCH] ixgbe: remove useless bd_number from adapter struct >> >> Because bd_number is not useful anymore, so remove it from adapter struct, >> or >> if keep it, we have to fix the boards driven counter bug in ixgbe_remove() >> and >> ixgbe_probe() only for trival debug purpose -- other output is enough. > > Thanks Ethan, I (briefly covering for Jeff Kirsher) have added this patch and your other one ofr ixgbevf to Jeff's internal tree. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h index c6c4ca7..238a74f 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h @@ -752,8 +752,6 @@ struct ixgbe_adapter { u8 __iomem *io_addr; /* Mainly for iounmap use */ u32 wol; - u16 bd_number; - u16 eeprom_verh; u16 eeprom_verl; u16 eeprom_cap; diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index d62e7a2..1e25e8e 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -7929,7 +7929,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) struct ixgbe_adapter *adapter = NULL; struct ixgbe_hw *hw; const struct ixgbe_info *ii = ixgbe_info_tbl[ent->driver_data]; - static int cards_found; int i, err, pci_using_dac, expected_gts; unsigned int indices = MAX_TX_QUEUES; u8 part_str[IXGBE_PBANUM_LENGTH]; @@ -8015,8 +8014,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) netdev->watchdog_timeo = 5 * HZ; strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); - adapter->bd_number = cards_found; - /* Setup hw api */ memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops)); hw->mac.type = ii->mac; @@ -8295,7 +8292,6 @@ skip_sriov: ixgbe_add_sanmac_netdev(netdev); e_dev_info("%s\n", ixgbe_default_device_descr); - cards_found++; #ifdef CONFIG_IXGBE_HWMON if (ixgbe_sysfs_init(adapter))
Because bd_number is not useful anymore, so remove it from adapter struct, or if keep it, we have to fix the boards driven counter bug in ixgbe_remove() and ixgbe_probe() only for trival debug purpose -- other output is enough. Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com> --- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 -- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ---- 2 files changed, 0 insertions(+), 6 deletions(-)