summaryrefslogtreecommitdiff
path: root/drivers/net/cnic.h
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2010-02-24 17:42:08 +0300
committerDavid S. Miller <davem@davemloft.net>2010-02-26 13:10:14 +0300
commita4dde3abbf87a495154a876576e1ab34b17b5ef1 (patch)
tree0a1faff1e54932ebb616fc5f0e412b187a433e94 /drivers/net/cnic.h
parentc76284af9ec8a010c502a70249cb74b3bb69ec6f (diff)
downloadlinux-a4dde3abbf87a495154a876576e1ab34b17b5ef1.tar.xz
cnic: Use union for the status blocks of different devices.
We only need to assign the status block address once and it also saves space in the structure. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: Benjamin Li <benli@broadcom.com> Signed-off-by: Eddie Wai <waie@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cnic.h')
-rw-r--r--drivers/net/cnic.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/cnic.h b/drivers/net/cnic.h
index 1921597ab4a3..d566390b8c4d 100644
--- a/drivers/net/cnic.h
+++ b/drivers/net/cnic.h
@@ -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;