summaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x/bnx2x_link.h
diff options
context:
space:
mode:
authorYaniv Rosner <yanivr@broadcom.com>2011-05-31 23:28:27 +0200
committerDavid S. Miller <davem@davemloft.net>2011-06-01 22:10:56 +0200
commit9045f6b44a01737a84c5bb79f580dccce6806d80 (patch)
tree38e95fb086ff7baccf33420c73f5e9160ce83126 /drivers/net/bnx2x/bnx2x_link.h
parentbnx2x: Fix BCM84833 settings (diff)
downloadlinux-9045f6b44a01737a84c5bb79f580dccce6806d80.tar.xz
linux-9045f6b44a01737a84c5bb79f580dccce6806d80.zip
bnx2x: Fix grammar and relocate code
This patch relocates some functions as a preparation for next patches, and also fixes some grammar mistakes. Signed-off-by: Yaniv Rosner <yanivr@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/bnx2x_link.h')
-rw-r--r--drivers/net/bnx2x/bnx2x_link.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bnx2x/bnx2x_link.h b/drivers/net/bnx2x/bnx2x_link.h
index 4d5509bf87aa..906b5117083d 100644
--- a/drivers/net/bnx2x/bnx2x_link.h
+++ b/drivers/net/bnx2x/bnx2x_link.h
@@ -121,8 +121,8 @@ struct bnx2x_phy {
/* Loaded during init */
u8 addr;
-
- u8 flags;
+ u8 def_md_devad;
+ u16 flags;
/* Require HW lock */
#define FLAGS_HW_LOCK_REQUIRED (1<<0)
/* No Over-Current detection */
@@ -134,8 +134,6 @@ struct bnx2x_phy {
#define FLAGS_REARM_LATCH_SIGNAL (1<<6)
#define FLAGS_SFP_NOT_APPROVED (1<<7)
- u8 def_md_devad;
- u8 reserved;
/* preemphasis values for the rx side */
u16 rx_preemphasis[4];