From: Kevin Traynor <ktraynor@redhat.com> To: stable@dpdk.org Cc: ktraynor@redhat.com, Ferruh Yigit <ferruh.yigit@intel.com> Subject: [dpdk-stable] [18.11 5/7] kni: fix ethtool build for gcc 9 Date: Thu, 9 Jan 2020 13:34:31 +0000 Message-ID: <20200109133433.12494-6-ktraynor@redhat.com> (raw) In-Reply-To: <20200109133433.12494-1-ktraynor@redhat.com> 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 <ktraynor@redhat.com> Cc: Ferruh Yigit <ferruh.yigit@intel.com> --- 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) /* disable PCS autoneg and support parallel detect only */ pcs_autoneg = false; - /* fall through to default case */ + /* fallthrough */ default: if (hw->mac.type == e1000_82575 || @@ -1761,4 +1761,5 @@ static s32 e1000_get_media_type_82575(struct e1000_hw *hw) } /* fall through for I2C based SGMII */ + /* fallthrough */ case E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES: /* read media type from SFP EEPROM */ diff --git a/kernel/linux/kni/ethtool/igb/e1000_mbx.c b/kernel/linux/kni/ethtool/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) mbx->stats.acks = 0; mbx->stats.rsts = 0; + /* fallthrough */ default: return E1000_SUCCESS; diff --git a/kernel/linux/kni/ethtool/igb/e1000_phy.c b/kernel/linux/kni/ethtool/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) break; } + /* fallthrough */ case 0: default: 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, case TCP_V4_FLOW: cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; + /* fallthrough */ case UDP_V4_FLOW: if (adapter->flags & IGB_FLAG_RSS_FIELD_IPV4_UDP) cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; + /* fallthrough */ case SCTP_V4_FLOW: case AH_ESP_V4_FLOW: @@ -2577,7 +2579,9 @@ static int igb_get_rss_hash_opts(struct igb_adapter *adapter, case TCP_V6_FLOW: cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; + /* fallthrough */ case UDP_V6_FLOW: if (adapter->flags & IGB_FLAG_RSS_FIELD_IPV6_UDP) cmd->data |= RXH_L4_B_0_1 | RXH_L4_B_2_3; + /* fallthrough */ case SCTP_V6_FLOW: case AH_ESP_V6_FLOW: diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/ethtool/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_adapter *adapter, bool msix) "Falling back to MSI interrupts.\n"); igb_reset_interrupt_capability(adapter); + /* fallthrough */ case IGB_INT_MODE_MSI: if (!pci_enable_msi(pdev)) @@ -4586,4 +4587,5 @@ bool igb_has_link(struct igb_adapter *adapter) if (!hw->mac.get_link_status) return true; + /* fallthrough */ case e1000_media_type_internal_serdes: e1000_check_for_link(hw); @@ -9562,4 +9564,5 @@ static void igb_vmm_control(struct igb_adapter *adapter) E1000_DTXCTL_SPOOF_INT); E1000_WRITE_REG(hw, E1000_DTXCTL, reg); + /* fallthrough */ case e1000_82580: /* enable replication vlan tag stripping */ @@ -9567,4 +9570,5 @@ static void igb_vmm_control(struct igb_adapter *adapter) reg |= E1000_RPLOLR_STRVLAN; E1000_WRITE_REG(hw, E1000_RPLOLR, reg); + /* fallthrough */ case e1000_i350: case e1000_i354: diff --git a/kernel/linux/kni/ethtool/igb/igb_param.c b/kernel/linux/kni/ethtool/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) if (adapter->rss_queues) break; + /* fallthrough */ case 0: adapter->rss_queues = min_t(u32, opt.arg.r.max, num_online_cpus()); diff --git a/kernel/linux/kni/ethtool/ixgbe/ixgbe_82599.c b/kernel/linux/kni/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, /* mask VLAN ID, fall through to mask VLAN priority */ fdirm |= IXGBE_FDIRM_VLANID; + /* fallthrough */ case 0x0FFF: /* mask VLAN priority */ @@ -1762,4 +1763,5 @@ s32 ixgbe_fdir_add_perfect_filter_82599(struct ixgbe_hw *hw, return IXGBE_ERR_CONFIG; } + /* fallthrough */ case IXGBE_ATR_FLOW_TYPE_TCPV4: case IXGBE_ATR_FLOW_TYPE_UDPV4: diff --git a/kernel/linux/kni/ethtool/ixgbe/ixgbe_common.c b/kernel/linux/kni/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, IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(i), rxpktsize); /* Fall through to configure remaining packet buffers */ + /* fallthrough */ case PBA_STRATEGY_EQUAL: rxpktsize = (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, break; } + /* fallthrough */ case IXGBE_SUBDEV_ID_82599_SFP: retval = 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) if (hw->mac.type == ixgbe_mac_82598EB) return true; + /* fallthrough */ default: return false; @@ -1419,4 +1420,5 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter) case ixgbe_mac_X540: adapter->flags2 |= IXGBE_FLAG2_TEMP_SENSOR_CAPABLE; + /* fallthrough */ case ixgbe_mac_82599EB: adapter->flags |= IXGBE_FLAG_MSI_CAPABLE | @@ -2034,4 +2036,5 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter) hwstats->b2ospc += IXGBE_READ_REG(hw, IXGBE_B2OSPC); hwstats->b2ogprc += IXGBE_READ_REG(hw, IXGBE_B2OGPRC); + /* fallthrough */ case ixgbe_mac_82599EB: for (i = 0; i < 16; i++) @@ -2682,4 +2685,5 @@ int ixgbe_kni_probe(struct pci_dev *pdev, if (hw->bus.func != 0) break; + /* fallthrough */ case IXGBE_SUBDEV_ID_82599_SFP: adapter->wol = IXGBE_WUFC_MAG; -- 2.21.1
next prev parent reply other threads:[~2020-01-09 13:34 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-09 13:34 [dpdk-stable] [18.11 0/7] Build fixes for 18.11 branch Kevin Traynor 2020-01-09 13:34 ` [dpdk-stable] [18.11 1/7] eal: drop unused macros for primary process check Kevin Traynor 2020-01-09 13:34 ` [dpdk-stable] [18.11 2/7] eventdev: use same log macro for all unsupported calls Kevin Traynor 2020-01-09 13:34 ` [dpdk-stable] [18.11 3/7] eal: remove legacy PMD log macro Kevin Traynor 2020-01-09 13:34 ` [dpdk-stable] [18.11 4/7] net/mlx: fix build with clang 9 Kevin Traynor 2020-01-09 13:34 ` Kevin Traynor [this message] 2020-01-09 13:34 ` [dpdk-stable] [18.11 6/7] pmdinfogen: fix freebsd build Kevin Traynor 2020-01-09 15:50 ` Neil Horman 2020-01-09 15:53 ` Neil Horman 2020-01-09 16:53 ` Kevin Traynor 2020-01-09 13:34 ` [dpdk-stable] [18.11 7/7] net/mlx: allow build only on Linux Kevin Traynor 2020-01-13 16:16 ` [dpdk-stable] [18.11 0/7] Build fixes for 18.11 branch Kevin Traynor 2020-01-14 14:29 ` Kevin Traynor
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200109133433.12494-6-ktraynor@redhat.com \ --to=ktraynor@redhat.com \ --cc=ferruh.yigit@intel.com \ --cc=stable@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git