tg3: Add some VPD preprocessor constants

This patch cleans up the VPD code by creating preprocessor definitions
and using them in the place of hardcoded constants.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 6a2c31071caf..cd30889650f8 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -1821,6 +1821,11 @@
 
 #define TG3_OTP_DEFAULT                 0x286c1640
 
+
+/* Hardware Legacy NVRAM layout */
+#define TG3_NVM_VPD_OFF                 0x100
+#define TG3_NVM_VPD_LEN                 256
+
 /* Hardware Selfboot NVRAM layout */
 #define TG3_NVM_HWSB_CFG1               0x00000004
 #define  TG3_NVM_HWSB_CFG1_MAJMSK       0xf8000000
@@ -2893,8 +2898,9 @@ struct tg3 {
         u32                             led_ctrl;
         u32                             phy_otp;
 
-        char                            board_part_number[24];
-#define TG3_VER_SIZE 32
+#define TG3_BPN_SIZE                    24
+        char                            board_part_number[TG3_BPN_SIZE];
+#define TG3_VER_SIZE                    ETHTOOL_FWVERS_LEN
         char                            fw_ver[TG3_VER_SIZE];
         u32                             nic_sram_data_cfg;
         u32                             pci_clock_ctrl;