pegasus: fix USB device ID for ETX-US2

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

diff --git a/drivers/net/bnx2x_link.h b/drivers/net/bnx2x_link.h
index 6d26d6c..40c2981 100644 (file)
--- a/drivers/net/bnx2x_link.h
+++ b/drivers/net/bnx2x_link.h
@@ -81,48 +81,59 @@ struct link_params {
 #define SWITCH_CFG_AUTO_DETECT PORT_FEATURE_CON_SWITCH_AUTO_DETECT
 
        u16 hw_led_mode; /* part of the hw_config read from the shmem */
+
+       /* phy_addr populated by the phy_init function */
+       u8 phy_addr;
+       /*u8 reserved1;*/
+
        u32 lane_config;
        u32 ext_phy_config;
-#define XGXS_EXT_PHY_TYPE(ext_phy_config)      (ext_phy_config & \
-                                       PORT_HW_CFG_XGXS_EXT_PHY_TYPE_MASK)
-#define SERDES_EXT_PHY_TYPE(ext_phy_config)    (ext_phy_config & \
-                                       PORT_HW_CFG_SERDES_EXT_PHY_TYPE_MASK)
+#define XGXS_EXT_PHY_TYPE(ext_phy_config) \
+               ((ext_phy_config) & PORT_HW_CFG_XGXS_EXT_PHY_TYPE_MASK)
+#define XGXS_EXT_PHY_ADDR(ext_phy_config) \
+               (((ext_phy_config) & PORT_HW_CFG_XGXS_EXT_PHY_ADDR_MASK) >> \
+                PORT_HW_CFG_XGXS_EXT_PHY_ADDR_SHIFT)
+#define SERDES_EXT_PHY_TYPE(ext_phy_config) \
+               ((ext_phy_config) & PORT_HW_CFG_SERDES_EXT_PHY_TYPE_MASK)
+
        /* Phy register parameter */
        u32 chip_id;
 
-       /* phy_addr populated by the CLC */
-       u8 phy_addr;
        u16 xgxs_config_rx[4]; /* preemphasis values for the rx side */
-
        u16 xgxs_config_tx[4]; /* preemphasis values for the tx side */
+
        u32 feature_config_flags;
 #define FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED (1<<0)
 #define FEATURE_CONFIG_BC_SUPPORTS_OPT_MDL_VRFY        (1<<2)
 #define FEATURE_CONFIG_BCM8727_NOC                     (1<<3)
+
        /* Device pointer passed to all callback functions */
        struct bnx2x *bp;
 };
 
 /* Output parameters */
 struct link_vars {
+       u8 phy_flags;
+
+       u8 mac_type;
+#define MAC_TYPE_NONE          0
+#define MAC_TYPE_EMAC          1
+#define MAC_TYPE_BMAC          2
+
        u8 phy_link_up; /* internal phy link indication */
        u8 link_up;
+
+       u16 line_speed;
        u16 duplex;
+
        u16 flow_ctrl;
-       u32 ieee_fc;
-       u8 mac_type;
+       u16 ieee_fc;
 
-#define MAC_TYPE_NONE  0
-#define MAC_TYPE_EMAC  1
-#define MAC_TYPE_BMAC  2
-       u16 line_speed;
        u32 autoneg;
 #define AUTO_NEG_DISABLED                      0x0
 #define AUTO_NEG_ENABLED                       0x1
 #define AUTO_NEG_COMPLETE                      0x2
-#define AUTO_NEG_PARALLEL_DETECTION_USED       0x3
-
-       u8 phy_flags;
+#define AUTO_NEG_PARALLEL_DETECTION_USED       0x3
 
        /* The same definitions as the shmem parameter */
        u32 link_status;
@@ -167,8 +178,7 @@ u8 bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 driver_loaded,
    Basically, the CLC takes care of the led for the link, but in case one needs
    to set/unset the led unnaturally, set the "mode" to LED_MODE_OPER to
    blink the led, and LED_MODE_OFF to set the led off.*/
-u8 bnx2x_set_led(struct bnx2x *bp, u8 port, u8 mode, u32 speed,
-              u16 hw_led_mode, u32 chip_id);
+u8 bnx2x_set_led(struct link_params *params, u8 mode, u32 speed);
 #define LED_MODE_OFF   0
 #define LED_MODE_OPER  2