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 C5207A0350 for ; Fri, 5 Jun 2020 13:26:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D23D01D5D8; Fri, 5 Jun 2020 13:26:29 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id A4BA21D5D8 for ; Fri, 5 Jun 2020 13:26:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591356388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=jaDw/qVNoOFmqzrV4QJ2ZU83QonTTBhwWtj451Qf2BY=; b=esE8P2fiEeVAHoPFcCl0fxYB+q/oC2r8qiPgQGnNjRFt+rzRCVyo++bwGCQw8pkQiHGsMa f2zc77rPxSUKdk/M4Sqa8pw/8eApu8+4wBxJbyP8xVHIrf3oz+xjWWRYJxyTkh3gJJMGs/ AnVNHW0haz+3xIUHTk57+/I7pEHvyhI= 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-292-XrOK8IPDPpGytF3cqwIhRw-1; Fri, 05 Jun 2020 07:26:26 -0400 X-MC-Unique: XrOK8IPDPpGytF3cqwIhRw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5665F835B8E; Fri, 5 Jun 2020 11:26:25 +0000 (UTC) Received: from [10.33.36.130] (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69CD35C290; Fri, 5 Jun 2020 11:26:24 +0000 (UTC) To: Luca Boccassi , stable@dpdk.org, ferruh.yigit@intel.com References: <20200528165751.9367-1-ktraynor@redhat.com> <20200528170510.9937-1-ktraynor@redhat.com> <9cb92a9da56a376439d2c48ca777d915b538766c.camel@debian.org> From: Kevin Traynor Autocrypt: addr=ktraynor@redhat.com; keydata= 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 Message-ID: <7cbf4823-60bc-6a69-b579-03470c7ddd54@redhat.com> Date: Fri, 5 Jun 2020 12:26:23 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <9cb92a9da56a376439d2c48ca777d915b538766c.camel@debian.org> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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 29/05/2020 09:25, Luca Boccassi wrote: > 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") >> >> 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. >> >> Update igb ethtool to use the define. >> >> 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(+) >> >> diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/ethtool/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 @@ >> >> #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 *skb, >> * @netdev: network interface device structure >> **/ >> +#ifdef HAVE_TX_TIMEOUT_TXQUEUE >> +static void igb_tx_timeout(struct net_device *netdev, unsigned int txqueue) >> +#else >> static void igb_tx_timeout(struct net_device *netdev) >> +#endif >> { >> struct igb_adapter *adapter = netdev_priv(netdev); > > Acked-by: Luca Boccassi > Thanks, applied