diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_dcb.h | 1 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_dcb_82598.c | 6 | ||||
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ixgbe/ixgbe_dcb.h b/drivers/net/ixgbe/ixgbe_dcb.h index 1cfe38ee164..d0b2450781a 100644 --- a/drivers/net/ixgbe/ixgbe_dcb.h +++ b/drivers/net/ixgbe/ixgbe_dcb.h | |||
@@ -139,7 +139,6 @@ struct ixgbe_dcb_config { | |||
139 | struct tc_configuration tc_config[MAX_TRAFFIC_CLASS]; | 139 | struct tc_configuration tc_config[MAX_TRAFFIC_CLASS]; |
140 | u8 bw_percentage[2][MAX_BW_GROUP]; /* One each for Tx/Rx */ | 140 | u8 bw_percentage[2][MAX_BW_GROUP]; /* One each for Tx/Rx */ |
141 | bool pfc_mode_enable; | 141 | bool pfc_mode_enable; |
142 | bool round_robin_enable; | ||
143 | 142 | ||
144 | enum dcb_rx_pba_cfg rx_pba_cfg; | 143 | enum dcb_rx_pba_cfg rx_pba_cfg; |
145 | 144 | ||
diff --git a/drivers/net/ixgbe/ixgbe_dcb_82598.c b/drivers/net/ixgbe/ixgbe_dcb_82598.c index 9a5e89c12e0..19aa80640f6 100644 --- a/drivers/net/ixgbe/ixgbe_dcb_82598.c +++ b/drivers/net/ixgbe/ixgbe_dcb_82598.c | |||
@@ -146,10 +146,8 @@ static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw, | |||
146 | 146 | ||
147 | /* Enable arbiter */ | 147 | /* Enable arbiter */ |
148 | reg &= ~IXGBE_DPMCS_ARBDIS; | 148 | reg &= ~IXGBE_DPMCS_ARBDIS; |
149 | if (!(dcb_config->round_robin_enable)) { | 149 | /* Enable DFP and Recycle mode */ |
150 | /* Enable DFP and Recycle mode */ | 150 | reg |= (IXGBE_DPMCS_TDPAC | IXGBE_DPMCS_TRM); |
151 | reg |= (IXGBE_DPMCS_TDPAC | IXGBE_DPMCS_TRM); | ||
152 | } | ||
153 | reg |= IXGBE_DPMCS_TSOEF; | 151 | reg |= IXGBE_DPMCS_TSOEF; |
154 | /* Configure Max TSO packet size 34KB including payload and headers */ | 152 | /* Configure Max TSO packet size 34KB including payload and headers */ |
155 | reg |= (0x4 << IXGBE_DPMCS_MTSOS_SHIFT); | 153 | reg |= (0x4 << IXGBE_DPMCS_MTSOS_SHIFT); |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index fbae703b46d..1e481487594 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -5173,7 +5173,6 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) | |||
5173 | adapter->dcb_cfg.bw_percentage[DCB_RX_CONFIG][0] = 100; | 5173 | adapter->dcb_cfg.bw_percentage[DCB_RX_CONFIG][0] = 100; |
5174 | adapter->dcb_cfg.rx_pba_cfg = pba_equal; | 5174 | adapter->dcb_cfg.rx_pba_cfg = pba_equal; |
5175 | adapter->dcb_cfg.pfc_mode_enable = false; | 5175 | adapter->dcb_cfg.pfc_mode_enable = false; |
5176 | adapter->dcb_cfg.round_robin_enable = false; | ||
5177 | adapter->dcb_set_bitmap = 0x00; | 5176 | adapter->dcb_set_bitmap = 0x00; |
5178 | ixgbe_copy_dcb_cfg(&adapter->dcb_cfg, &adapter->temp_dcb_cfg, | 5177 | ixgbe_copy_dcb_cfg(&adapter->dcb_cfg, &adapter->temp_dcb_cfg, |
5179 | adapter->ring_feature[RING_F_DCB].indices); | 5178 | adapter->ring_feature[RING_F_DCB].indices); |