summaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x.h
diff options
context:
space:
mode:
authorVladislav Zolotarov2010-04-19 03:13:57 +0200
committerDavid S. Miller2010-04-19 22:17:08 +0200
commitcdaa7cb84b63e0491582ef62fd0c7bf22a57e519 (patch)
treebdf17500a3e7670434c8ce96c1ceb581fdaa32d9 /drivers/net/bnx2x.h
parentbnx2x: Protect code with NOMCP (diff)
downloadkernel-qcow2-linux-cdaa7cb84b63e0491582ef62fd0c7bf22a57e519.tar.gz
kernel-qcow2-linux-cdaa7cb84b63e0491582ef62fd0c7bf22a57e519.tar.xz
kernel-qcow2-linux-cdaa7cb84b63e0491582ef62fd0c7bf22a57e519.zip
bnx2x: White spaces
White spaces, code readability and prints. Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x.h')
-rw-r--r--drivers/net/bnx2x.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index 150bd08ed5be..bdfe084b8abe 100644
--- a/drivers/net/bnx2x.h
+++ b/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;