Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index e1c2076228ba..ee01f5a6d0d4 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -34,7 +34,7 @@
 
 #define DRV_NAME                "enic"
 #define DRV_DESCRIPTION         "Cisco 10G Ethernet Driver"
-#define DRV_VERSION             "1.1.0.100"
+#define DRV_VERSION             "1.1.0.241a"
 #define DRV_COPYRIGHT           "Copyright 2008-2009 Cisco Systems, Inc"
 #define PFX                     DRV_NAME ": "
 
@@ -89,9 +89,12 @@ struct enic {
         spinlock_t devcmd_lock;
         u8 mac_addr[ETH_ALEN];
         u8 mc_addr[ENIC_MULTICAST_PERFECT_FILTERS][ETH_ALEN];
+        unsigned int flags;
         unsigned int mc_count;
         int csum_rx_enabled;
         u32 port_mtu;
+        u32 rx_coalesce_usecs;
+        u32 tx_coalesce_usecs;
 
         /* work queue cache line section */
         ____cacheline_aligned struct vnic_wq wq[ENIC_WQ_MAX];