summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorEilon Greenstein <eilong@broadcom.com>2009-02-12 08:38:11 +0000
committerDavid S. Miller <davem@davemloft.net>2009-02-15 23:31:50 -0800
commit5cd65a93e9335393d5e1f18d35d337b7ba1280f8 (patch)
tree7db7ba7f0ec8a01e9a37cf5bc9b5b65010267a9d /drivers/net
parentb5bf9068ebb1b4012e4c0fef58490f97e6b6a0db (diff)
downloadlinux-3.10-5cd65a93e9335393d5e1f18d35d337b7ba1280f8.tar.gz
linux-3.10-5cd65a93e9335393d5e1f18d35d337b7ba1280f8.tar.bz2
linux-3.10-5cd65a93e9335393d5e1f18d35d337b7ba1280f8.zip
bnx2x: Better struct naming
This is the device info from the chip shared memory - rename to avoid confusion Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bnx2x_hsi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h
index 8452605d058..88b2aa3180e 100644
--- a/drivers/net/bnx2x_hsi.h
+++ b/drivers/net/bnx2x_hsi.h
@@ -488,7 +488,7 @@ struct port_feat_cfg { /* port 0: 0x454 port 1: 0x4c8 */
/****************************************************************************
* Device Information *
****************************************************************************/
-struct dev_info { /* size */
+struct shm_dev_info { /* size */
u32 bc_rev; /* 8 bits each: major, minor, build */ /* 4 */
@@ -841,7 +841,7 @@ struct shmem_region { /* SharedMem Offset (size) */
#define SHR_MEM_VALIDITY_ACTIVE_MFW_NONE 0x000001c0
#define SHR_MEM_VALIDITY_ACTIVE_MFW_MASK 0x000001c0
- struct dev_info dev_info; /* 0x8 (0x438) */
+ struct shm_dev_info dev_info; /* 0x8 (0x438) */
u8 reserved[52*PORT_MAX];