patches for DPDK stable branches
 help / color / Atom feed
* [dpdk-stable] [PATCH 18.11] kni: fix ethtool build with kernel 5.6
@ 2020-05-28 16:57 Kevin Traynor
  2020-05-28 17:05 ` [dpdk-stable] [PATCH 18.11 v2] " Kevin Traynor
  0 siblings, 1 reply; 4+ messages in thread
From: Kevin Traynor @ 2020-05-28 16:57 UTC (permalink / raw)
  To: stable, ferruh.yigit; +Cc: Kevin Traynor

With the following Linux commit a new parameter 'txqueue' has been added
to 'ndo_tx_timeout' ndo:
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 <ktraynor@redhat.com>
---
 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 <linux/if_bridge.h>
+#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);
-- 
2.21.3


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [dpdk-stable] [PATCH 18.11 v2] kni: fix ethtool build with kernel 5.6
  2020-05-28 16:57 [dpdk-stable] [PATCH 18.11] kni: fix ethtool build with kernel 5.6 Kevin Traynor
@ 2020-05-28 17:05 ` " Kevin Traynor
  2020-05-29  8:25   ` Luca Boccassi
  0 siblings, 1 reply; 4+ messages in thread
From: Kevin Traynor @ 2020-05-28 17:05 UTC (permalink / raw)
  To: stable, ferruh.yigit; +Cc: Kevin Traynor

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 <ktraynor@redhat.com>
---
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 <linux/if_bridge.h>
+#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);
-- 
2.21.3


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [dpdk-stable] [PATCH 18.11 v2] kni: fix ethtool build with kernel 5.6
  2020-05-28 17:05 ` [dpdk-stable] [PATCH 18.11 v2] " Kevin Traynor
@ 2020-05-29  8:25   ` Luca Boccassi
  2020-06-05 11:26     ` Kevin Traynor
  0 siblings, 1 reply; 4+ messages in thread
From: Luca Boccassi @ 2020-05-29  8:25 UTC (permalink / raw)
  To: Kevin Traynor, stable, ferruh.yigit

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 <ktraynor@redhat.com>
> ---
> 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 <linux/if_bridge.h>
> +#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 <bluca@debian.org>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [dpdk-stable] [PATCH 18.11 v2] kni: fix ethtool build with kernel 5.6
  2020-05-29  8:25   ` Luca Boccassi
@ 2020-06-05 11:26     ` Kevin Traynor
  0 siblings, 0 replies; 4+ messages in thread
From: Kevin Traynor @ 2020-06-05 11:26 UTC (permalink / raw)
  To: Luca Boccassi, stable, ferruh.yigit

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 <ktraynor@redhat.com>
>> ---
>> 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 <linux/if_bridge.h>
>> +#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 <bluca@debian.org>
> 

Thanks, applied


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-28 16:57 [dpdk-stable] [PATCH 18.11] kni: fix ethtool build with kernel 5.6 Kevin Traynor
2020-05-28 17:05 ` [dpdk-stable] [PATCH 18.11 v2] " Kevin Traynor
2020-05-29  8:25   ` Luca Boccassi
2020-06-05 11:26     ` Kevin Traynor

patches for DPDK stable branches

Archives are clonable:
	git clone --mirror http://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/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/ public-inbox