diff options
-rw-r--r-- | drivers/net/ixgbe/ixgbe_dcb.c | 6 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_dcb.h | 3 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/ixgbe_dcb.c index 0d44c6470ca3..4f2f0ae67354 100644 --- a/drivers/net/ixgbe/ixgbe_dcb.c +++ b/drivers/net/ixgbe/ixgbe_dcb.c | |||
@@ -42,7 +42,8 @@ | |||
42 | * It should be called only after the rules are checked by | 42 | * It should be called only after the rules are checked by |
43 | * ixgbe_dcb_check_config(). | 43 | * ixgbe_dcb_check_config(). |
44 | */ | 44 | */ |
45 | s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_dcb_config *dcb_config, | 45 | s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_hw *hw, |
46 | struct ixgbe_dcb_config *dcb_config, | ||
46 | int max_frame, u8 direction) | 47 | int max_frame, u8 direction) |
47 | { | 48 | { |
48 | struct tc_bw_alloc *p; | 49 | struct tc_bw_alloc *p; |
@@ -124,7 +125,8 @@ s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_dcb_config *dcb_config, | |||
124 | * credit may not be enough to send out a TSO | 125 | * credit may not be enough to send out a TSO |
125 | * packet in descriptor plane arbitration. | 126 | * packet in descriptor plane arbitration. |
126 | */ | 127 | */ |
127 | if (credit_max && | 128 | if ((hw->mac.type == ixgbe_mac_82598EB) && |
129 | credit_max && | ||
128 | (credit_max < MINIMUM_CREDIT_FOR_TSO)) | 130 | (credit_max < MINIMUM_CREDIT_FOR_TSO)) |
129 | credit_max = MINIMUM_CREDIT_FOR_TSO; | 131 | credit_max = MINIMUM_CREDIT_FOR_TSO; |
130 | 132 | ||
diff --git a/drivers/net/ixgbe/ixgbe_dcb.h b/drivers/net/ixgbe/ixgbe_dcb.h index 0208a87b129e..1cfe38ee1644 100644 --- a/drivers/net/ixgbe/ixgbe_dcb.h +++ b/drivers/net/ixgbe/ixgbe_dcb.h | |||
@@ -150,7 +150,8 @@ struct ixgbe_dcb_config { | |||
150 | /* DCB driver APIs */ | 150 | /* DCB driver APIs */ |
151 | 151 | ||
152 | /* DCB credits calculation */ | 152 | /* DCB credits calculation */ |
153 | s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_dcb_config *, int, u8); | 153 | s32 ixgbe_dcb_calculate_tc_credits(struct ixgbe_hw *, |
154 | struct ixgbe_dcb_config *, int, u8); | ||
154 | 155 | ||
155 | /* DCB hw initialization */ | 156 | /* DCB hw initialization */ |
156 | s32 ixgbe_dcb_hw_config(struct ixgbe_hw *, struct ixgbe_dcb_config *); | 157 | s32 ixgbe_dcb_hw_config(struct ixgbe_hw *, struct ixgbe_dcb_config *); |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index f374207e14b4..45d988741fe9 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -3366,9 +3366,9 @@ static void ixgbe_configure_dcb(struct ixgbe_adapter *adapter) | |||
3366 | max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE); | 3366 | max_frame = max(max_frame, IXGBE_FCOE_JUMBO_FRAME_SIZE); |
3367 | #endif | 3367 | #endif |
3368 | 3368 | ||
3369 | ixgbe_dcb_calculate_tc_credits(&adapter->dcb_cfg, max_frame, | 3369 | ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame, |
3370 | DCB_TX_CONFIG); | 3370 | DCB_TX_CONFIG); |
3371 | ixgbe_dcb_calculate_tc_credits(&adapter->dcb_cfg, max_frame, | 3371 | ixgbe_dcb_calculate_tc_credits(hw, &adapter->dcb_cfg, max_frame, |
3372 | DCB_RX_CONFIG); | 3372 | DCB_RX_CONFIG); |
3373 | 3373 | ||
3374 | /* reconfigure the hardware */ | 3374 | /* reconfigure the hardware */ |