---

yaml --- r: 194292 b: refs/heads/master c: cdaa7cb h: refs/heads/master v: v3
git-mirror · Apr 19, 2010 · 3452ea1 · 3452ea1
1 parent a9a6d6d
commit 3452ea1
Show file tree

Hide file tree

Showing 3 changed files with 214 additions and 162 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2145a92057a94d2d1e3e9674fe03774cda7455ad
+refs/heads/master: cdaa7cb84b63e0491582ef62fd0c7bf22a57e519
diff --git a/trunk/drivers/net/bnx2x.h b/trunk/drivers/net/bnx2x.h
@@ -83,7 +83,12 @@ do {								\
 	       __func__, __LINE__,				\
 	       bp->dev ? (bp->dev->name) : "?",			\
 	       ##__args);					\
-} while (0)
+	} while (0)
+
+#define BNX2X_ERROR(__fmt, __args...) do { \
+	pr_err("[%s:%d]" __fmt, __func__, __LINE__, ##__args); \
+	} while (0)
+
 
 /* before we have a dev->name use dev_info() */
 #define BNX2X_DEV_INFO(__fmt, __args...)			 \
@@ -975,6 +980,8 @@ struct bnx2x {
 	u16			rx_quick_cons_trip;
 	u16			rx_ticks_int;
 	u16			rx_ticks;
+/* Maximal coalescing timeout in us */
+#define BNX2X_MAX_COALESCE_TOUT		(0xf0*12)
 
 	u32			lin_cnt;