bnx2: Fix register printouts during NETEV_WATCHDOG.

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

diff --git a/drivers/net/cnic.h b/drivers/net/cnic.h
index 1921597..a0d853d 100644 (file)
--- a/drivers/net/cnic.h
+++ b/drivers/net/cnic.h
@@ -1,6 +1,6 @@
 /* cnic.h: Broadcom CNIC core network driver.
  *
- * Copyright (c) 2006-2009 Broadcom Corporation
+ * Copyright (c) 2006-2010 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -224,9 +224,12 @@ struct cnic_local {
        u16             kcq_prod_idx;
        u32             kcq_io_addr;
 
-       void                            *status_blk;
-       struct status_block_msix        *bnx2_status_blk;
-       struct host_status_block        *bnx2x_status_blk;
+       union {
+               void                            *gen;
+               struct status_block_msix        *bnx2;
+               struct host_status_block        *bnx2x;
+       } status_blk;
+
        struct host_def_status_block    *bnx2x_def_status_blk;
 
        u32                             status_blk_num;