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

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/net/enic/vnic_enet.h b/drivers/net/enic/vnic_enet.h
index 6332ac9391b8..8eeb6758491b 100644
--- a/drivers/net/enic/vnic_enet.h
+++ b/drivers/net/enic/vnic_enet.h
@@ -20,6 +20,10 @@
 #ifndef _VNIC_ENIC_H_
 #define _VNIC_ENIC_H_
 
+/* Hardware intr coalesce timer is in units of 1.5us */
+#define INTR_COALESCE_USEC_TO_HW(usec) ((usec) * 2/3)
+#define INTR_COALESCE_HW_TO_USEC(usec) ((usec) * 3/2)
+
 /* Device-specific region: enet configuration */
 struct vnic_enet_config {
         u32 flags;
@@ -30,6 +34,7 @@ struct vnic_enet_config {
         u8 intr_timer_type;
         u8 intr_mode;
         char devname[16];
+        u32 intr_timer_usec;
 };
 
 #define VENETF_TSO              0x1     /* TSO enabled */