sys/dev/ixgbe/ixgbe_82599.c
@@ -1759,7 +1759,9 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw,
case 0x0000: case 0x0000:
/* mask VLAN ID */ /* mask VLAN ID */
fdirm |= IXGBE_FDIRM_VLANID; fdirm |= IXGBE_FDIRM_VLANID;
- /* FALLTHROUGH */+ /* mask VLAN priority */
+ fdirm |= IXGBE_FDIRM_VLANP;
+ break;
case 0x0FFF: case 0x0FFF:
/* mask VLAN priority */ /* mask VLAN priority */
fdirm |= IXGBE_FDIRM_VLANP; fdirm |= IXGBE_FDIRM_VLANP;
@@ -2049,7 +2051,9 @@ s32 ixgbe_fdir_add_perfect_filter_82599(struct ixgbe_hw *hw,
DEBUGOUT(" Error on src/dst port\n"); DEBUGOUT(" Error on src/dst port\n");
return IXGBE_ERR_CONFIG; return IXGBE_ERR_CONFIG;
} }
- /* FALLTHROUGH */+ input_mask->formatted.flow_type = IXGBE_ATR_L4TYPE_IPV6_MASK |
+ IXGBE_ATR_L4TYPE_MASK;
+ break;
case IXGBE_ATR_FLOW_TYPE_TCPV4: case IXGBE_ATR_FLOW_TYPE_TCPV4:
case IXGBE_ATR_FLOW_TYPE_TUNNELED_TCPV4: case IXGBE_ATR_FLOW_TYPE_TUNNELED_TCPV4:
case IXGBE_ATR_FLOW_TYPE_UDPV4: case IXGBE_ATR_FLOW_TYPE_UDPV4:
sys/dev/ixgbe/ixgbe_common.c
@@ -268,8 +268,8 @@ s32 ixgbe_setup_fc_generic(struct ixgbe_hw *hw)
if (ret_val != IXGBE_SUCCESS) if (ret_val != IXGBE_SUCCESS)
goto out; goto out;
- /* only backplane uses autoc */+ reg = IXGBE_READ_REG(hw, IXGBE_PCS1GANA);
- /* FALLTHROUGH */+ break;
case ixgbe_media_type_fiber_fixed: case ixgbe_media_type_fiber_fixed:
case ixgbe_media_type_fiber_qsfp: case ixgbe_media_type_fiber_qsfp:
case ixgbe_media_type_fiber: case ixgbe_media_type_fiber:
@@ -4779,8 +4779,10 @@ void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw, int num_pb, u32 headroom,
rxpktsize <<= IXGBE_RXPBSIZE_SHIFT; rxpktsize <<= IXGBE_RXPBSIZE_SHIFT;
for (; i < (num_pb / 2); i++) for (; i < (num_pb / 2); i++)
IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize); IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize);
- /* configure remaining packet buffers */+ rxpktsize = (pbsize / (num_pb - i)) << IXGBE_RXPBSIZE_SHIFT;
- /* FALLTHROUGH */+ for (; i < num_pb; i++)
+ IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize);
+ break;
case PBA_STRATEGY_EQUAL: case PBA_STRATEGY_EQUAL:
rxpktsize = (pbsize / (num_pb - i)) << IXGBE_RXPBSIZE_SHIFT; rxpktsize = (pbsize / (num_pb - i)) << IXGBE_RXPBSIZE_SHIFT;
for (; i < num_pb; i++) for (; i < num_pb; i++)
sys/dev/ixgbe/ixgbe_x550.c
@@ -355,8 +355,7 @@ static s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw)
/* set up for CS4227 usage */ /* set up for CS4227 usage */
ixgbe_setup_mux_ctl(hw); ixgbe_setup_mux_ctl(hw);
ixgbe_check_cs4227(hw); ixgbe_check_cs4227(hw);
- /* Fallthrough */+ return ixgbe_identify_sfp_module_X550em(hw);
-
case IXGBE_DEV_ID_X550EM_A_SFP_N: case IXGBE_DEV_ID_X550EM_A_SFP_N:
return ixgbe_identify_sfp_module_X550em(hw); return ixgbe_identify_sfp_module_X550em(hw);
break; break;
@@ -1869,7 +1868,9 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
break; break;
} }
} }
- /* fall through */+ *speed = IXGBE_LINK_SPEED_10GB_FULL |
+ IXGBE_LINK_SPEED_1GB_FULL;
+ break;
default: default:
*speed = IXGBE_LINK_SPEED_10GB_FULL | *speed = IXGBE_LINK_SPEED_10GB_FULL |
IXGBE_LINK_SPEED_1GB_FULL; IXGBE_LINK_SPEED_1GB_FULL;
@@ -3589,7 +3590,9 @@ u64 ixgbe_get_supported_physical_layer_X550em(struct ixgbe_hw *hw)
break; break;
} }
} }
- /* fall through */+ physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR |
+ IXGBE_PHYSICAL_LAYER_1000BASE_KX;
+ break;
case ixgbe_phy_x550em_xfi: case ixgbe_phy_x550em_xfi:
physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR | physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR |
IXGBE_PHYSICAL_LAYER_1000BASE_KX; IXGBE_PHYSICAL_LAYER_1000BASE_KX;