[PATCH] i386: Update defconfig

[safe/jmp/linux-2.6] / drivers / net / chelsio / common.h

diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index e4e59d2..74758d2 100644 (file)
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -228,6 +228,7 @@ struct adapter_params {
        unsigned short chip_revision;
        unsigned char  chip_version;
        unsigned char  is_asic;
+       unsigned char  has_msi;
 };
 
 struct link_config {
@@ -278,11 +279,13 @@ struct adapter {
        struct petp   *tp;
 
        struct port_info port[MAX_NPORTS];
-       struct work_struct stats_update_task;
+       struct delayed_work stats_update_task;
        struct timer_list stats_update_timer;
 
        spinlock_t tpi_lock;
        spinlock_t work_lock;
+       spinlock_t mac_lock;
+
        /* guards async operations */
        spinlock_t async_lock ____cacheline_aligned;
        u32 slow_intr_mask;