From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6F2FEA04F9 for ; Thu, 9 Jan 2020 14:34:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5CB4D1DD8D; Thu, 9 Jan 2020 14:34:58 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 8FB9F1DD89 for ; Thu, 9 Jan 2020 14:34:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578576896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=deUnSMEETAbuK+/QxH/WO+5jdugFv+w35i5dIniGzOQ=; b=bNmR920k/QYQyW9r70tVNRXECoPnOReJFDFln+/Pmy5WyqL321YbiXoLDNCFuGngi1SyRA gOYRkDkhlbdV8CHdJOZisWPfgm13Q07SiAt+Ky0rVsrAnbyPTS7LKcQwddpJMoUEr7vhXS ds7TX/Ty/iu2V9dbUebfLglDvFWX1wc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-47-4xsnKiOBMXyTA5GAFsBMcw-1; Thu, 09 Jan 2020 08:34:52 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C37D5DBE8; Thu, 9 Jan 2020 13:34:51 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF40D7C38D; Thu, 9 Jan 2020 13:34:50 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org Cc: ktraynor@redhat.com, Ferruh Yigit Date: Thu, 9 Jan 2020 13:34:31 +0000 Message-Id: <20200109133433.12494-6-ktraynor@redhat.com> In-Reply-To: <20200109133433.12494-1-ktraynor@redhat.com> References: <20200109133433.12494-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: 4xsnKiOBMXyTA5GAFsBMcw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] [18.11 5/7] kni: fix ethtool build for gcc 9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Add fall through comments to switch statements. This is not an issue on DPDK master branch as ethtool for KNI has been removed. Signed-off-by: Kevin Traynor Cc: Ferruh Yigit --- kernel/linux/kni/ethtool/igb/e1000_82575.c | 3 ++- kernel/linux/kni/ethtool/igb/e1000_mbx.c | 1 + kernel/linux/kni/ethtool/igb/e1000_phy.c | 1 + kernel/linux/kni/ethtool/igb/igb_ethtool.c | 4 ++++ kernel/linux/kni/ethtool/igb/igb_main.c | 4 ++++ kernel/linux/kni/ethtool/igb/igb_param.c | 1 + kernel/linux/kni/ethtool/ixgbe/ixgbe_82599.c | 2 ++ kernel/linux/kni/ethtool/ixgbe/ixgbe_common.c | 1 + kernel/linux/kni/ethtool/ixgbe/ixgbe_ethtool.c | 1 + kernel/linux/kni/ethtool/ixgbe/ixgbe_main.c | 4 ++++ 10 files changed, 21 insertions(+), 1 deletion(-) diff --git a/kernel/linux/kni/ethtool/igb/e1000_82575.c b/kernel/linux/kni/= ethtool/igb/e1000_82575.c index 98346709d..7ab4b44a8 100644 --- a/kernel/linux/kni/ethtool/igb/e1000_82575.c +++ b/kernel/linux/kni/ethtool/igb/e1000_82575.c @@ -1634,5 +1634,5 @@ static s32 e1000_setup_serdes_link_82575(struct e1000= _hw *hw) =09=09/* disable PCS autoneg and support parallel detect only */ =09=09pcs_autoneg =3D false; -=09=09/* fall through to default case */ +=09=09/* fallthrough */ =09default: =09=09if (hw->mac.type =3D=3D e1000_82575 || @@ -1761,4 +1761,5 @@ static s32 e1000_get_media_type_82575(struct e1000_hw= *hw) =09=09} =09=09/* fall through for I2C based SGMII */ +=09=09/* fallthrough */ =09case E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES: =09=09/* read media type from SFP EEPROM */ diff --git a/kernel/linux/kni/ethtool/igb/e1000_mbx.c b/kernel/linux/kni/et= htool/igb/e1000_mbx.c index 1be443491..18e660532 100644 --- a/kernel/linux/kni/ethtool/igb/e1000_mbx.c +++ b/kernel/linux/kni/ethtool/igb/e1000_mbx.c @@ -505,4 +505,5 @@ s32 e1000_init_mbx_params_pf(struct e1000_hw *hw) =09=09mbx->stats.acks =3D 0; =09=09mbx->stats.rsts =3D 0; +=09=09/* fallthrough */ =09default: =09=09return E1000_SUCCESS; diff --git a/kernel/linux/kni/ethtool/igb/e1000_phy.c b/kernel/linux/kni/et= htool/igb/e1000_phy.c index 1934a309c..5257b9141 100644 --- a/kernel/linux/kni/ethtool/igb/e1000_phy.c +++ b/kernel/linux/kni/ethtool/igb/e1000_phy.c @@ -1206,4 +1206,5 @@ s32 e1000_copper_link_setup_m88_gen2(struct e1000_hw = *hw) =09=09=09break; =09=09} +=09=09/* fallthrough */ =09case 0: =09default: diff --git a/kernel/linux/kni/ethtool/igb/igb_ethtool.c b/kernel/linux/kni/= ethtool/igb/igb_ethtool.c index b6bddc025..a35f3da7d 100644 --- a/kernel/linux/kni/ethtool/igb/igb_ethtool.c +++ b/kernel/linux/kni/ethtool/igb/igb_ethtool.c @@ -2565,7 +2565,9 @@ static int igb_get_rss_hash_opts(struct igb_adapter *= adapter, =09case TCP_V4_FLOW: =09=09cmd->data |=3D RXH_L4_B_0_1 | RXH_L4_B_2_3; +=09=09/* fallthrough */ =09case UDP_V4_FLOW: =09=09if (adapter->flags & IGB_FLAG_RSS_FIELD_IPV4_UDP) =09=09=09cmd->data |=3D RXH_L4_B_0_1 | RXH_L4_B_2_3; +=09=09/* fallthrough */ =09case SCTP_V4_FLOW: =09case AH_ESP_V4_FLOW: @@ -2577,7 +2579,9 @@ static int igb_get_rss_hash_opts(struct igb_adapter *= adapter, =09case TCP_V6_FLOW: =09=09cmd->data |=3D RXH_L4_B_0_1 | RXH_L4_B_2_3; +=09=09/* fallthrough */ =09case UDP_V6_FLOW: =09=09if (adapter->flags & IGB_FLAG_RSS_FIELD_IPV6_UDP) =09=09=09cmd->data |=3D RXH_L4_B_0_1 | RXH_L4_B_2_3; +=09=09/* fallthrough */ =09case SCTP_V6_FLOW: =09case AH_ESP_V6_FLOW: diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/eth= tool/igb/igb_main.c index 69d3ea5fa..cb1b53677 100644 --- a/kernel/linux/kni/ethtool/igb/igb_main.c +++ b/kernel/linux/kni/ethtool/igb/igb_main.c @@ -1042,4 +1042,5 @@ static void igb_set_interrupt_capability(struct igb_a= dapter *adapter, bool msix) =09=09 "Falling back to MSI interrupts.\n"); =09=09igb_reset_interrupt_capability(adapter); +=09=09/* fallthrough */ =09case IGB_INT_MODE_MSI: =09=09if (!pci_enable_msi(pdev)) @@ -4586,4 +4587,5 @@ bool igb_has_link(struct igb_adapter *adapter) =09=09if (!hw->mac.get_link_status) =09=09=09return true; +=09=09/* fallthrough */ =09case e1000_media_type_internal_serdes: =09=09e1000_check_for_link(hw); @@ -9562,4 +9564,5 @@ static void igb_vmm_control(struct igb_adapter *adapt= er) =09=09=09E1000_DTXCTL_SPOOF_INT); =09=09E1000_WRITE_REG(hw, E1000_DTXCTL, reg); +=09=09/* fallthrough */ =09case e1000_82580: =09=09/* enable replication vlan tag stripping */ @@ -9567,4 +9570,5 @@ static void igb_vmm_control(struct igb_adapter *adapt= er) =09=09reg |=3D E1000_RPLOLR_STRVLAN; =09=09E1000_WRITE_REG(hw, E1000_RPLOLR, reg); +=09=09/* fallthrough */ =09case e1000_i350: =09case e1000_i354: diff --git a/kernel/linux/kni/ethtool/igb/igb_param.c b/kernel/linux/kni/et= htool/igb/igb_param.c index 98209a101..2aca46ca1 100644 --- a/kernel/linux/kni/ethtool/igb/igb_param.c +++ b/kernel/linux/kni/ethtool/igb/igb_param.c @@ -610,4 +610,5 @@ void igb_check_options(struct igb_adapter *adapter) =09=09=09=09if (adapter->rss_queues) =09=09=09=09=09break; +=09=09=09=09/* fallthrough */ =09=09=09case 0: =09=09=09=09adapter->rss_queues =3D min_t(u32, opt.arg.r.max, num_online_c= pus()); diff --git a/kernel/linux/kni/ethtool/ixgbe/ixgbe_82599.c b/kernel/linux/kn= i/ethtool/ixgbe/ixgbe_82599.c index 3f1591230..10e670663 100644 --- a/kernel/linux/kni/ethtool/ixgbe/ixgbe_82599.c +++ b/kernel/linux/kni/ethtool/ixgbe/ixgbe_82599.c @@ -1582,4 +1582,5 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *= hw, =09=09/* mask VLAN ID, fall through to mask VLAN priority */ =09=09fdirm |=3D IXGBE_FDIRM_VLANID; +=09=09/* fallthrough */ =09case 0x0FFF: =09=09/* mask VLAN priority */ @@ -1762,4 +1763,5 @@ s32 ixgbe_fdir_add_perfect_filter_82599(struct ixgbe_= hw *hw, =09=09=09return IXGBE_ERR_CONFIG; =09=09} +=09=09/* fallthrough */ =09case IXGBE_ATR_FLOW_TYPE_TCPV4: =09case IXGBE_ATR_FLOW_TYPE_UDPV4: diff --git a/kernel/linux/kni/ethtool/ixgbe/ixgbe_common.c b/kernel/linux/k= ni/ethtool/ixgbe/ixgbe_common.c index e9b9529a2..f17562dd8 100644 --- a/kernel/linux/kni/ethtool/ixgbe/ixgbe_common.c +++ b/kernel/linux/kni/ethtool/ixgbe/ixgbe_common.c @@ -3852,4 +3852,5 @@ void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw, int= num_pb, u32 headroom, =09=09=09IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize); =09=09/* Fall through to configure remaining packet buffers */ +=09=09/* fallthrough */ =09case PBA_STRATEGY_EQUAL: =09=09rxpktsize =3D (pbsize / (num_pb - i)) << IXGBE_RXPBSIZE_SHIFT; diff --git a/kernel/linux/kni/ethtool/ixgbe/ixgbe_ethtool.c b/kernel/linux/= kni/ethtool/ixgbe/ixgbe_ethtool.c index f2ded19e9..a03a77ff2 100644 --- a/kernel/linux/kni/ethtool/ixgbe/ixgbe_ethtool.c +++ b/kernel/linux/kni/ethtool/ixgbe/ixgbe_ethtool.c @@ -1781,4 +1781,5 @@ static int ixgbe_wol_exclusion(struct ixgbe_adapter *= adapter, =09=09=09=09break; =09=09=09} +=09=09=09/* fallthrough */ =09=09case IXGBE_SUBDEV_ID_82599_SFP: =09=09=09retval =3D 0; diff --git a/kernel/linux/kni/ethtool/ixgbe/ixgbe_main.c b/kernel/linux/kni= /ethtool/ixgbe/ixgbe_main.c index a5acf19c5..c9b255345 100644 --- a/kernel/linux/kni/ethtool/ixgbe/ixgbe_main.c +++ b/kernel/linux/kni/ethtool/ixgbe/ixgbe_main.c @@ -841,4 +841,5 @@ static bool ixgbe_is_sfp(struct ixgbe_hw *hw) =09=09if (hw->mac.type =3D=3D ixgbe_mac_82598EB) =09=09=09return true; +=09=09/* fallthrough */ =09default: =09=09return false; @@ -1419,4 +1420,5 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapte= r) =09case ixgbe_mac_X540: =09=09adapter->flags2 |=3D IXGBE_FLAG2_TEMP_SENSOR_CAPABLE; +=09=09/* fallthrough */ =09case ixgbe_mac_82599EB: =09=09adapter->flags |=3D IXGBE_FLAG_MSI_CAPABLE | @@ -2034,4 +2036,5 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter= ) =09=09hwstats->b2ospc +=3D IXGBE_READ_REG(hw, IXGBE_B2OSPC); =09=09hwstats->b2ogprc +=3D IXGBE_READ_REG(hw, IXGBE_B2OGPRC); +=09=09/* fallthrough */ =09case ixgbe_mac_82599EB: =09=09for (i =3D 0; i < 16; i++) @@ -2682,4 +2685,5 @@ int ixgbe_kni_probe(struct pci_dev *pdev, =09=09=09if (hw->bus.func !=3D 0) =09=09=09=09break; +=09=09=09/* fallthrough */ =09=09case IXGBE_SUBDEV_ID_82599_SFP: =09=09=09adapter->wol =3D IXGBE_WUFC_MAG; --=20 2.21.1