bnx2x: DCB rework

[pandora-kernel.git] / drivers / net / bnx2x / bnx2x.h

diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index 53fa8ea..333f5d6 100644 (file)
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -966,6 +966,8 @@ struct bnx2x_slowpath {
 
        union {
                struct function_start_data      func_start;
+               /* pfc configuration for DCBX ramrod */
+               struct flow_control_configuration pfc_config;
        } func_rdata;
 
        /* used by dmae command executer */
@@ -980,8 +982,6 @@ struct bnx2x_slowpath {
 
        u32                             wb_comp;
        u32                             wb_data[4];
-       /* pfc configuration for DCBX ramrod */
-       struct flow_control_configuration pfc_config;
 };
 
 #define bnx2x_sp(bp, var)              (&bp->slowpath->var)
@@ -1417,9 +1417,6 @@ struct bnx2x {
        char                    fw_ver[32];
        const struct firmware   *firmware;
 
-       /* LLDP params */
-       struct bnx2x_config_lldp_params         lldp_config_params;
-
        /* DCB support on/off */
        u16 dcb_state;
 #define BNX2X_DCB_STATE_OFF                    0