X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fchelsio%2Fcommon.h;h=4bd2455b0fe31b50bc20fba8f6a35e90ccc323fd;hb=ac390c60a833192e87fb09ed8d67f5d1a84306c8;hp=787f2f2820fe461625da7392c8c8b1af49d74314;hpb=edacf6bb7e7e1b75f2937966a50119439ff78ccb;p=linux-2.6 diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h index 787f2f2820..4bd2455b0f 100644 --- a/drivers/net/chelsio/common.h +++ b/drivers/net/chelsio/common.h @@ -278,6 +278,7 @@ struct adapter { struct peespi *espi; struct petp *tp; + struct napi_struct napi; struct port_info port[MAX_NPORTS]; struct delayed_work stats_update_task; struct timer_list stats_update_timer; @@ -322,9 +323,9 @@ struct board_info { unsigned char mdio_mdiinv; unsigned char mdio_mdc; unsigned char mdio_phybaseaddr; - struct gmac *gmac; - struct gphy *gphy; - struct mdio_ops *mdio_ops; + const struct gmac *gmac; + const struct gphy *gphy; + const struct mdio_ops *mdio_ops; const char *desc; }; @@ -371,13 +372,14 @@ extern void t1_interrupts_enable(adapter_t *adapter); extern void t1_interrupts_disable(adapter_t *adapter); extern void t1_interrupts_clear(adapter_t *adapter); extern int t1_elmer0_ext_intr_handler(adapter_t *adapter); +extern void t1_elmer0_ext_intr(adapter_t *adapter); extern int t1_slow_intr_handler(adapter_t *adapter); extern int t1_link_start(struct cphy *phy, struct cmac *mac, struct link_config *lc); extern const struct board_info *t1_get_board_info(unsigned int board_id); extern const struct board_info *t1_get_board_info_from_ids(unsigned int devid, unsigned short ssid); -extern int t1_seeprom_read(adapter_t *adapter, u32 addr, u32 *data); +extern int t1_seeprom_read(adapter_t *adapter, u32 addr, __le32 *data); extern int t1_get_board_rev(adapter_t *adapter, const struct board_info *bi, struct adapter_params *p); extern int t1_init_hw_modules(adapter_t *adapter);