Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / drivers / net / cxgb3 / common.h

diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 510e93f90b912ae8b2b62622712087e79778eb5a..d444f5881f56691ccf5e2e9276ad5f4694714791 100644 (file)
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -127,8 +127,8 @@ enum {                              /* adapter interrupt-maintained statistics */
 
 enum {
        TP_VERSION_MAJOR        = 1,
-       TP_VERSION_MINOR        = 0,
-       TP_VERSION_MICRO        = 44
+       TP_VERSION_MINOR        = 1,
+       TP_VERSION_MICRO        = 0
 };
 
 #define S_TP_VERSION_MAJOR             16
@@ -168,8 +168,8 @@ enum {
 };
 
 struct sg_ent {                        /* SGE scatter/gather entry */
-       u32 len[2];
-       u64 addr[2];
+       __be32 len[2];
+       __be64 addr[2];
 };
 
 #ifndef SGE_NUM_GENBITS
@@ -351,6 +351,7 @@ struct tp_params {
 
 struct qset_params {           /* SGE queue set parameters */
        unsigned int polling;   /* polling/interrupt service for rspq */
+       unsigned int lro;       /* large receive offload */
        unsigned int coalesce_usecs;    /* irq coalescing timer */
        unsigned int rspq_size; /* # of entries in response queue */
        unsigned int fl_size;   /* # of entries in regular free list */
@@ -438,6 +439,7 @@ enum {                                          /* chip revisions */
        T3_REV_A  = 0,
        T3_REV_B  = 2,
        T3_REV_B2 = 3,
+       T3_REV_C  = 4,
 };
 
 struct trace_params {
@@ -513,6 +515,7 @@ struct cmac {
        u64 rx_mcnt;
        unsigned int toggle_cnt;
        unsigned int txen;
+       u64 rx_pause;
        struct mac_stats stats;
 };
 
@@ -679,8 +682,8 @@ int t3_phy_intr_handler(struct adapter *adapter);
 void t3_link_changed(struct adapter *adapter, int port_id);
 int t3_link_start(struct cphy *phy, struct cmac *mac, struct link_config *lc);
 const struct adapter_info *t3_get_adapter_info(unsigned int board_id);
-int t3_seeprom_read(struct adapter *adapter, u32 addr, u32 *data);
-int t3_seeprom_write(struct adapter *adapter, u32 addr, u32 data);
+int t3_seeprom_read(struct adapter *adapter, u32 addr, __le32 *data);
+int t3_seeprom_write(struct adapter *adapter, u32 addr, __le32 data);
 int t3_seeprom_wp(struct adapter *adapter, int enable);
 int t3_get_tp_version(struct adapter *adapter, u32 *vers);
 int t3_check_tpsram_version(struct adapter *adapter, int *must_load);
@@ -690,12 +693,13 @@ int t3_read_flash(struct adapter *adapter, unsigned int addr,
                  unsigned int nwords, u32 *data, int byte_oriented);
 int t3_load_fw(struct adapter *adapter, const u8 * fw_data, unsigned int size);
 int t3_get_fw_version(struct adapter *adapter, u32 *vers);
-int t3_check_fw_version(struct adapter *adapter);
+int t3_check_fw_version(struct adapter *adapter, int *must_load);
 int t3_init_hw(struct adapter *adapter, u32 fw_params);
 void mac_prep(struct cmac *mac, struct adapter *adapter, int index);
 void early_hw_init(struct adapter *adapter, const struct adapter_info *ai);
 int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,
                    int reset);
+int t3_replay_prep_adapter(struct adapter *adapter);
 void t3_led_ready(struct adapter *adapter);
 void t3_fatal_err(struct adapter *adapter);
 void t3_set_vlan_accel(struct adapter *adapter, unsigned int ports, int on);