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 17542A00C5 for ; Fri, 29 May 2020 10:25:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C330F1DBC6; Fri, 29 May 2020 10:25:40 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id BCAE61DBC6 for ; Fri, 29 May 2020 10:25:39 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id s8so2418892wrt.9 for ; Fri, 29 May 2020 01:25:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:content-transfer-encoding:user-agent:mime-version; bh=CsrjO5BELl6rQ+1Akxb6WQhEEeFOZ3oq6tXignGza1M=; b=hGhyn3wj0jmxWYEXqYiZLRhgje1IT19fSPsKRxUihADCUWLjmnbkStrZRtSBmS+QVv rQNKXEqTsrI9lkxNmtyB1C2DdvZ+dzksq7KKQ+f2JlDf5AKcXhxwlWVY/gvaHRBe4bpg oM2lu/za46gKx9uqfTJTYrZPGqIKePmtZuWvZlej0JqA58QZsUVkVtt6PNRPBA7APH5g 0t9TUiWKPMIinRpyOXeWYFPBlVIoUYm3okMGkWw6OIfh8L/FnVvMGy6sli4djeucrfL5 wrksWEi7PIM+5s3lhQEV3kYd+ToEyO34KaVNx5rGRRhylVuzSPHtkDMn6GkMmRrH8z6L L78A== X-Gm-Message-State: AOAM530TcEfMEceXcseQxbDHGhz/s4Pg2kCUymB0mAos7Vc7JzMR2/Ep pqASJrFV6G4a7gZkKNZK83U= X-Google-Smtp-Source: ABdhPJxS83qxh9kVEhKwVyA+BsGgAzoyIf3RoB5JSmBzzX6s+JxsJSnLsrkY3NWY0PXkoU5BYM8ahw== X-Received: by 2002:adf:db81:: with SMTP id u1mr2597286wri.164.1590740739294; Fri, 29 May 2020 01:25:39 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id k12sm6995771wrn.42.2020.05.29.01.25.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 01:25:38 -0700 (PDT) Message-ID: <9cb92a9da56a376439d2c48ca777d915b538766c.camel@debian.org> From: Luca Boccassi To: Kevin Traynor , stable@dpdk.org, ferruh.yigit@intel.com Date: Fri, 29 May 2020 09:25:37 +0100 In-Reply-To: <20200528170510.9937-1-ktraynor@redhat.com> References: <20200528165751.9367-1-ktraynor@redhat.com> <20200528170510.9937-1-ktraynor@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH 18.11 v2] kni: fix ethtool build with kernel 5.6 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" On Thu, 2020-05-28 at 18:05 +0100, Kevin Traynor wrote: > With the following Linux commit a new parameter 'txqueue' has been added > to 'ndo_tx_timeout' ndo: > commit 0290bd291cc0 ("netdev: pass the stuck queue to the timeout handler= ") >=20 > A check on Linux kernel version is already done in > commit 6ff755242707 ("kni: fix build with Linux 5.6") > and HAVE_TX_TIMEOUT_TXQUEUE is used to indicate if the extra parameter > is required. >=20 > Update igb ethtool to use the define. >=20 > Signed-off-by: Kevin Traynor > --- > v2: add the word 'commit' on the same line as the referenced commits > because checkpatch says I should > --- > kernel/linux/kni/ethtool/igb/igb_main.c | 9 +++++++++ > 1 file changed, 9 insertions(+) >=20 > diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/e= thtool/igb/igb_main.c > index cb1b536775..5a07d007a2 100644 > --- a/kernel/linux/kni/ethtool/igb/igb_main.c > +++ b/kernel/linux/kni/ethtool/igb/igb_main.c > @@ -37,4 +37,5 @@ > =20 > #include > +#include "compat.h" > #include "igb.h" > #include "igb_vmdq.h" > @@ -155,5 +156,9 @@ static bool igb_clean_tx_irq(struct igb_q_vector *); > static bool igb_clean_rx_irq(struct igb_q_vector *, int); > static int igb_ioctl(struct net_device *, struct ifreq *, int cmd); > +#ifdef HAVE_TX_TIMEOUT_TXQUEUE > +static void igb_tx_timeout(struct net_device *, unsigned int); > +#else > static void igb_tx_timeout(struct net_device *); > +#endif /* HAVE_TX_TIMEOUT_TXQUEUE */ > static void igb_reset_task(struct work_struct *); > #ifdef HAVE_VLAN_RX_REGISTER > @@ -5624,5 +5629,9 @@ static netdev_tx_t igb_xmit_frame(struct sk_buff *s= kb, > * @netdev: network interface device structure > **/ > +#ifdef HAVE_TX_TIMEOUT_TXQUEUE > +static void igb_tx_timeout(struct net_device *netdev, unsigned int txque= ue) > +#else > static void igb_tx_timeout(struct net_device *netdev) > +#endif > { > struct igb_adapter *adapter =3D netdev_priv(netdev); Acked-by: Luca Boccassi