From patchwork Sat Dec 26 17:10:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 352525 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDFDEC433E0 for ; Sat, 26 Dec 2020 17:11:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B3582221E7 for ; Sat, 26 Dec 2020 17:11:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726281AbgLZRLi (ORCPT ); Sat, 26 Dec 2020 12:11:38 -0500 Received: from smtprelay0220.hostedemail.com ([216.40.44.220]:60050 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726010AbgLZRLh (ORCPT ); Sat, 26 Dec 2020 12:11:37 -0500 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay07.hostedemail.com (Postfix) with ESMTP id 43300181D3026; Sat, 26 Dec 2020 17:10:56 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: boats47_2f0077427484 X-Filterd-Recvd-Size: 5425 Received: from [192.168.1.159] (unknown [47.151.137.21]) (Authenticated sender: joe@perches.com) by omf11.hostedemail.com (Postfix) with ESMTPA; Sat, 26 Dec 2020 17:10:54 +0000 (UTC) Message-ID: Subject: [PATCH] ethernet: Remove invalid trailers after %pI4 From: Joe Perches To: netdev@vger.kernel.org Cc: Tom Rix , Michael Chan , "David S. Miller" , Jakub Kicinski , Jesse Brandeburg , Tony Nguyen , Jiri Pirko , Ido Schimmel , Ariel Elior , GR-everest-linux-l2@marvell.com, linux-kernel@vger.kernel.org, intel-wired-lan Date: Sat, 26 Dec 2020 09:10:53 -0800 User-Agent: Evolution 3.38.1-1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Alphanumeric characters after vsprintf pointer extension %pI4 are not valid and are not emitted. Remove the invalid characters from the %pI4 uses. Signed-off-by: Joe Perches --- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 6 +++--- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++-- drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c index 5e4429b14b8c..213cbdea3888 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c @@ -1232,7 +1232,7 @@ static int bnxt_tc_resolve_tunnel_hdrs(struct bnxt *bp, rt = ip_route_output_key(dev_net(real_dst_dev), &flow); if (IS_ERR(rt)) { - netdev_info(bp->dev, "no route to %pI4b\n", &flow.daddr); + netdev_info(bp->dev, "no route to %pI4\n", &flow.daddr); return -EOPNOTSUPP; } @@ -1258,7 +1258,7 @@ static int bnxt_tc_resolve_tunnel_hdrs(struct bnxt *bp, #endif } else if (dst_dev != real_dst_dev) { netdev_info(bp->dev, - "dst_dev(%s) for %pI4b is not PF-if(%s)\n", + "dst_dev(%s) for %pI4 is not PF-if(%s)\n", netdev_name(dst_dev), &flow.daddr, netdev_name(real_dst_dev)); rc = -EOPNOTSUPP; @@ -1267,7 +1267,7 @@ static int bnxt_tc_resolve_tunnel_hdrs(struct bnxt *bp, nbr = dst_neigh_lookup(&rt->dst, &flow.daddr); if (!nbr) { - netdev_info(bp->dev, "can't lookup neighbor for %pI4b\n", + netdev_info(bp->dev, "can't lookup neighbor for %pI4\n", &flow.daddr); rc = -EOPNOTSUPP; goto put_rt; diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 1db482d310c2..eab6ce63b63d 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -7924,7 +7924,7 @@ static int i40e_parse_cls_flower(struct i40e_vsi *vsi, if (match.mask->dst == cpu_to_be32(0xffffffff)) { field_flags |= I40E_CLOUD_FIELD_IIP; } else { - dev_err(&pf->pdev->dev, "Bad ip dst mask %pI4b\n", + dev_err(&pf->pdev->dev, "Bad ip dst mask %pI4\n", &match.mask->dst); return I40E_ERR_CONFIG; } @@ -7934,7 +7934,7 @@ static int i40e_parse_cls_flower(struct i40e_vsi *vsi, if (match.mask->src == cpu_to_be32(0xffffffff)) { field_flags |= I40E_CLOUD_FIELD_IIP; } else { - dev_err(&pf->pdev->dev, "Bad ip src mask %pI4b\n", + dev_err(&pf->pdev->dev, "Bad ip src mask %pI4\n", &match.mask->src); return I40E_ERR_CONFIG; } diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 41424ee909a0..6c711385aae9 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -2297,7 +2297,7 @@ static void mlxsw_sp_router_neigh_ent_ipv4_process(struct mlxsw_sp *mlxsw_sp, if (!n) return; - netdev_dbg(dev, "Updating neighbour with IP=%pI4h\n", &dip); + netdev_dbg(dev, "Updating neighbour with IP=%pI4\n", &dip); neigh_event_send(n, NULL); neigh_release(n); } diff --git a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c index a99861124630..6756f7919deb 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_iwarp.c +++ b/drivers/net/ethernet/qlogic/qed/qed_iwarp.c @@ -584,7 +584,7 @@ qed_iwarp_print_tcp_ramrod(struct qed_hwfn *p_hwfn, if (p_tcp_ramrod->tcp.ip_version == TCP_IPV4) { DP_VERBOSE(p_hwfn, QED_MSG_RDMA, - "local_ip=%pI4h:%x, remote_ip=%pI4h:%x, vlan=%x\n", + "local_ip=%pI4:%x, remote_ip=%pI4:%x, vlan=%x\n", p_tcp_ramrod->tcp.local_ip, p_tcp_ramrod->tcp.local_port, p_tcp_ramrod->tcp.remote_ip, @@ -1548,7 +1548,7 @@ qed_iwarp_print_cm_info(struct qed_hwfn *p_hwfn, if (cm_info->ip_version == QED_TCP_IPV4) DP_VERBOSE(p_hwfn, QED_MSG_RDMA, - "remote_ip %pI4h:%x, local_ip %pI4h:%x vlan=%x\n", + "remote_ip %pI4:%x, local_ip %pI4:%x vlan=%x\n", cm_info->remote_ip, cm_info->remote_port, cm_info->local_ip, cm_info->local_port, cm_info->vlan);