[BNX2]: Re-organize firmware structures.

[deliverable/linux.git] / drivers / net / bnx2.h

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index ca31904893ea48862d315024699100db3c47307d..11e9c55d1dd00a0132282ca329a7807e7cdbd2ef 100644 (file)
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -3696,6 +3696,8 @@ struct l2_fhdr {
 
 /* 5708 Serdes PHY registers */
 
+#define BCM5708S_BMCR_FORCE_2500               0x20
+
 #define BCM5708S_UP1                           0xb
 
 #define BCM5708S_UP1_2G5                       0x1
@@ -4038,6 +4040,7 @@ struct bnx2 {
 
        u8                      serdes_an_pending;
 #define SERDES_AN_TIMEOUT      (HZ / 3)
+#define SERDES_FORCED_TIMEOUT  (HZ / 10)
 
        u8                      mac_addr[8];
 
@@ -4104,41 +4107,43 @@ struct cpu_reg {
 };
 
 struct fw_info {
-       u32 ver_major;
-       u32 ver_minor;
-       u32 ver_fix;
+       const u32 ver_major;
+       const u32 ver_minor;
+       const u32 ver_fix;
 
-       u32 start_addr;
+       const u32 start_addr;
 
        /* Text section. */
-       u32 text_addr;
-       u32 text_len;
-       u32 text_index;
+       const u32 text_addr;
+       const u32 text_len;
+       const u32 text_index;
        u32 *text;
+       u8 *gz_text;
+       const u32 gz_text_len;
 
        /* Data section. */
-       u32 data_addr;
-       u32 data_len;
-       u32 data_index;
-       u32 *data;
+       const u32 data_addr;
+       const u32 data_len;
+       const u32 data_index;
+       const u32 *data;
 
        /* SBSS section. */
-       u32 sbss_addr;
-       u32 sbss_len;
-       u32 sbss_index;
-       u32 *sbss;
+       const u32 sbss_addr;
+       const u32 sbss_len;
+       const u32 sbss_index;
+       const u32 *sbss;
 
        /* BSS section. */
-       u32 bss_addr;
-       u32 bss_len;
-       u32 bss_index;
-       u32 *bss;
+       const u32 bss_addr;
+       const u32 bss_len;
+       const u32 bss_index;
+       const u32 *bss;
 
        /* Read-only section. */
-       u32 rodata_addr;
-       u32 rodata_len;
-       u32 rodata_index;
-       u32 *rodata;
+       const u32 rodata_addr;
+       const u32 rodata_len;
+       const u32 rodata_index;
+       const u32 *rodata;
 };
 
 #define RV2P_PROC1                              0