tg3: Cleanup firmware parsing code

[cascardo/linux.git] / drivers / net / ethernet / broadcom / tg3.h

diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index 8d7d4c2..b5098f0 100644 (file)
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -3009,17 +3009,18 @@ enum TG3_FLAGS {
        TG3_FLAG_JUMBO_CAPABLE,
        TG3_FLAG_CHIP_RESETTING,
        TG3_FLAG_INIT_COMPLETE,
-       TG3_FLAG_TSO_BUG,
        TG3_FLAG_MAX_RXPEND_64,
-       TG3_FLAG_TSO_CAPABLE,
        TG3_FLAG_PCI_EXPRESS, /* BCM5785 + pci_is_pcie() */
        TG3_FLAG_ASF_NEW_HANDSHAKE,
        TG3_FLAG_HW_AUTONEG,
        TG3_FLAG_IS_NIC,
        TG3_FLAG_FLASH,
+       TG3_FLAG_FW_TSO,
        TG3_FLAG_HW_TSO_1,
        TG3_FLAG_HW_TSO_2,
        TG3_FLAG_HW_TSO_3,
+       TG3_FLAG_TSO_CAPABLE,
+       TG3_FLAG_TSO_BUG,
        TG3_FLAG_ICH_WORKAROUND,
        TG3_FLAG_1SHOT_MSI,
        TG3_FLAG_NO_FWARE_REPORTED,
@@ -3064,6 +3065,13 @@ enum TG3_FLAGS {
        TG3_FLAG_NUMBER_OF_FLAGS,       /* Last entry in enum TG3_FLAGS */
 };
 
+struct tg3_firmware_hdr {
+       __be32 version; /* unused for fragments */
+       __be32 base_addr;
+       __be32 len;
+};
+#define TG3_FW_HDR_LEN         (sizeof(struct tg3_firmware_hdr))
+
 struct tg3 {
        /* begin "general, frequently-used members" cacheline section */